Merge cherrypicks of ['googleplex-android-review.googlesource.com/25909955'] into 24Q1-release.android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: I99f85c0319c2d891ad06458277b6ecce939282c0

1 files changed, 9 insertions, 14 deletions

diff --git a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplay.cpp b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplay.cpp
index d4e9458..29ee7ef 100644
--- a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplay.cpp
+++ b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplay.cpp
@@ -1129,23 +1129,18 @@ void ExynosPrimaryDisplay::setDisplayNeedHandleIdleExit(const bool needed, const
 }
 
 void ExynosPrimaryDisplay::handleDisplayIdleEnter(const uint32_t idleTeRefreshRate) {
-    {
-        Mutex::Autolock lock(mDisplayMutex);
-        uint32_t btsRefreshRate = getBtsRefreshRate();
-        if (idleTeRefreshRate <= btsRefreshRate) {
-            return;
-        }
+    Mutex::Autolock lock(mDisplayMutex);
+    uint32_t btsRefreshRate = getBtsRefreshRate();
+    if (idleTeRefreshRate <= btsRefreshRate) {
+        return;
     }
 
     bool needed = false;
-    {
-        Mutex::Autolock lock(mDRMutex);
-        for (size_t i = 0; i < mLayers.size(); i++) {
-            if (mLayers[i]->mOtfMPP && mLayers[i]->mM2mMPP == nullptr &&
-                !mLayers[i]->checkBtsCap(idleTeRefreshRate)) {
-                needed = true;
-                break;
-            }
+    for (size_t i = 0; i < mLayers.size(); i++) {
+        if (mLayers[i]->mOtfMPP && mLayers[i]->mM2mMPP == nullptr &&
+            !mLayers[i]->checkBtsCap(idleTeRefreshRate)) {
+            needed = true;
+            break;
         }
     }