commit d940f0c8084bf2252ba55d0b70f555ba045bddf4
author Alex Sakhartchouk <alexst@google.com> Fri Apr 14 20:15:31 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 14 20:15:31 2017 +0000
tree fdfa4d8407673c3b74938e4aca3f18f8541b77e9
parent 3804e73bf32e00f2f66c80f294db47f91a91533d
parent 5d6d98a1dff7a6de2ea89f5098af0b77e1d5c36a

Merge "Release virtual display hwcId during vr mode transition." into oc-dev
am: 5d6d98a1df

Change-Id: Id7cc172bae46f53fabdf9b9520d417e951f3249f

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 09a4124..a5f1d60 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1242,6 +1242,13 @@
     // mCurrentState and mDrawingState and re-apply all changes when we make the
     // transition.
     mDrawingState.displays.clear();
+    // Release virtual display hwcId during vr mode transition.
+    for (size_t displayId = 0; displayId < mDisplays.size(); ++displayId) {
+        const sp<DisplayDevice>& displayDevice = mDisplays[displayId];
+        if (displayDevice->getDisplayType() == DisplayDevice::DISPLAY_VIRTUAL) {
+            displayDevice->disconnect(getHwComposer());
+        }
+    }
     mDisplays.clear();
     initializeDisplays();
 }