commit 810a75538b9485ce46c3c9f3e103148806ff8d9e
author Marin Shalamanov <shalamanov@google.com> Mon Jun 08 13:54:22 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 08 13:54:22 2020 +0000
tree cc26d280cc9c2b13a7aee509e097a8e76fd813b2
parent 5bcc8f8a38ed372cb7487abc6fbdb1ffb87e1681
parent 4c5e301006a4426d4634fc31097d837191924930

Merge "[SF] Don't reset display state on reconnection" into rvc-dev

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 2e22735..68dec66 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -2675,7 +2675,8 @@
         }
         processDisplayAdded(displayToken, currentState);
         if (currentState.physical) {
-            initializeDisplays();
+            const auto display = getDisplayDeviceLocked(displayToken);
+            setPowerModeInternal(display, hal::PowerMode::ON);
         }
         return;
     }