Snap for 9468833 from ef7c3b59cbeb4bed9af218e86c49ada8518da890 to t-keystone-qcom-release

Change-Id: I2ec7c89880ecbe8d53f5bb76d516380bb48ec6ad

2 files changed, 1 insertions, 13 deletions

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 0699ae0108..bc19446747 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -2441,21 +2441,10 @@ nsecs_t SurfaceFlinger::getVsyncPeriodFromHWC() const {
     return 0;
 }
 
-sp<DisplayDevice> SurfaceFlinger::getCurrentVsyncSource() {
-    std::lock_guard<std::recursive_mutex> lockVsync(mVsyncLock);
-
-    if (mNextVsyncSource) {
-        return mNextVsyncSource;
-    } else if (mActiveVsyncSource) {
-        return mActiveVsyncSource;
-    }
-
-    return getDefaultDisplayDeviceLocked();
-}
-
 nsecs_t SurfaceFlinger::getVsyncPeriodFromHWCcb() {
     std::lock_guard<std::recursive_mutex> lockVsync(mVsyncLock);
 
+    Mutex::Autolock lock(mStateLock);
     auto display = getDefaultDisplayDeviceLocked();
     if (mNextVsyncSource) {
         display = mNextVsyncSource;
diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h
index add68af3c1..c41d7ab816 100644
--- a/services/surfaceflinger/SurfaceFlinger.h
+++ b/services/surfaceflinger/SurfaceFlinger.h
@@ -1122,7 +1122,6 @@ private:
      */
     nsecs_t getVsyncPeriodFromHWC() const REQUIRES(mStateLock);
     nsecs_t getVsyncPeriodFromHWCcb();
-    sp<DisplayDevice> getCurrentVsyncSource();
 
     void setHWCVsyncEnabled(PhysicalDisplayId id, hal::Vsync enabled) {
         mLastHWCVsyncState = enabled;