commit 0e8fcc2c27f278478483ebbe1befe1460e8bbed1
author Stephen Hines <srhines@google.com> Thu Oct 04 21:42:29 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 04 21:42:30 2012 -0700
tree dabb6a7a6d0d4c41014e856c7a56e8d23fb0da27
parent e835976d285df80e261546bd4d016dadb45d906d
parent d920670f252d7984f8729cd578ce8c0befa77273

Merge "Fix missing parens in CleanSpec.mk." into jb-mr1-dev

services/surfaceflinger/DisplayHardware/HWComposer.cpp

diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
index 597e5d6..dd9a762 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
@@ -686,8 +686,11 @@
 }
 
 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);