commit 7fc3ef0eb0077eedaa09a7b505b6ec067e814170
author Michael Lentine <mlentine@google.com> Wed May 27 17:39:55 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 27 17:39:59 2015 +0000
tree bb837313b93ed085c2d7a8869e8501dea6956c37
parent 0e65e6c283c96d514c5ecefbb46a976939cfa64a
parent 10613dc3b565e95d3d5f459ec70fd2f6a77f807a

Merge "Add hotplug support for primary display." into mnc-dev

services/surfaceflinger/DisplayHardware/HWComposer.cpp

diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
index 579b39e..02c31ff 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
@@ -305,13 +305,16 @@
 }
 
 void HWComposer::hotplug(int disp, int connected) {
-    if (disp == HWC_DISPLAY_PRIMARY || disp >= VIRTUAL_DISPLAY_ID_BASE) {
+    if (disp >= VIRTUAL_DISPLAY_ID_BASE) {
         ALOGE("hotplug event received for invalid display: disp=%d connected=%d",
                 disp, connected);
         return;
     }
     queryDisplayProperties(disp);
-    mEventHandler.onHotplugReceived(disp, bool(connected));
+    // Do not teardown or recreate the primary display
+    if (disp != HWC_DISPLAY_PRIMARY) {
+        mEventHandler.onHotplugReceived(disp, bool(connected));
+    }
 }
 
 static float getDefaultDensity(uint32_t width, uint32_t height) {