diff options
| author | Mathias Agopian <mathias@google.com> | 2012-10-04 20:24:17 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-04 20:24:17 -0700 |
| commit | e835976d285df80e261546bd4d016dadb45d906d (patch) | |
| tree | 579ca6230810dbaef6e4e8c7250f5b8ffd26f421 | |
| parent | 27b28fd9960b73a1f13e22dd6655f75e2e76eef7 (diff) | |
| parent | 5a8f9012ee8bb9dc1ad14432b96a821f08802ee3 (diff) | |
| download | frameworks_native-e835976d285df80e261546bd4d016dadb45d906d.zip frameworks_native-e835976d285df80e261546bd4d016dadb45d906d.tar.gz frameworks_native-e835976d285df80e261546bd4d016dadb45d906d.tar.bz2 | |
Merge "Tone down a fatal assert" into jb-mr1-dev
| -rw-r--r-- | services/surfaceflinger/DisplayHardware/HWComposer.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
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 @@ 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); |