commit 980418350b15d595ebe17ec9ae895dac374c6ee0
author Dominik Laskowski <domlaskowski@google.com> Thu Aug 01 18:35:59 2019 -0700
committer Dominik Laskowski <domlaskowski@google.com> Fri Aug 16 16:27:58 2019 -0700
tree f451791885e6a6d6dadea3d78f0a52fe70f89a44
parent 13db07b6bcccb58ce51a385399e7288aaab0e077

SF: Clean up Scheduler

Remove dynamic allocation for Scheduler::{Connection,ConnectionHandle},
as well as ref-counting for the latter. Also, remove dead code and make
members private.

Bug: 130554049
Test: libsurfaceflinger_unittest
Change-Id: Ibb9dc8d4cb66451a4172c852a36032bbc0a54411

services/surfaceflinger/Scheduler/VSyncModulator.h

diff --git a/services/surfaceflinger/Scheduler/VSyncModulator.h b/services/surfaceflinger/Scheduler/VSyncModulator.h
index 636c8c8..727cef2 100644
--- a/services/surfaceflinger/Scheduler/VSyncModulator.h
+++ b/services/surfaceflinger/Scheduler/VSyncModulator.h
@@ -56,8 +56,8 @@
         nsecs_t thresholdForNextVsync;
     };
 
-    VSyncModulator(Scheduler&, const sp<Scheduler::ConnectionHandle>& appConnectionHandle,
-                   const sp<Scheduler::ConnectionHandle>& sfConnectionHandle, const OffsetsConfig&);
+    VSyncModulator(Scheduler&, ConnectionHandle appConnectionHandle,
+                   ConnectionHandle sfConnectionHandle, const OffsetsConfig&);
 
     void setPhaseOffsets(const OffsetsConfig&) EXCLUDES(mMutex);
 
@@ -92,8 +92,8 @@
     void updateOffsetsLocked() REQUIRES(mMutex);
 
     Scheduler& mScheduler;
-    const sp<Scheduler::ConnectionHandle> mAppConnectionHandle;
-    const sp<Scheduler::ConnectionHandle> mSfConnectionHandle;
+    const ConnectionHandle mAppConnectionHandle;
+    const ConnectionHandle mSfConnectionHandle;
 
     mutable std::mutex mMutex;
     OffsetsConfig mOffsetsConfig GUARDED_BY(mMutex);