Merge "Tone down a fatal assert" into jb-mr1-dev

1 files changed, 5 insertions, 2 deletions

diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
index 597e5d6305..dd9a762f95 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
@@ -686,8 +686,11 @@ status_t HWComposer::acquire(int disp) {
 }
 
 void HWComposer::disconnectDisplay(int disp) {
-    LOG_ALWAYS_FATAL_IF(disp < 0 || disp == HWC_DISPLAY_PRIMARY ||
-                        disp >= HWC_NUM_DISPLAY_TYPES);
+    LOG_ALWAYS_FATAL_IF(disp < 0 || disp == HWC_DISPLAY_PRIMARY);
+    if (disp >= HWC_NUM_DISPLAY_TYPES) {
+        // nothing to do for these yet
+        return;
+    }
     DisplayData& dd(mDisplayData[disp]);
     if (dd.list != NULL) {
         free(dd.list);