diff options
| author | Andy McFadden <fadden@android.com> | 2012-10-04 19:09:45 -0700 |
|---|---|---|
| committer | Andy McFadden <fadden@android.com> | 2012-10-04 19:09:45 -0700 |
| commit | 5a8f9012ee8bb9dc1ad14432b96a821f08802ee3 (patch) | |
| tree | 7bb48ffa48261b2d8975e4d86beb522c6b88d99d /services | |
| parent | 9a14392256354538f1f43a5e80fe46c2c2b965cb (diff) | |
| download | frameworks_native-5a8f9012ee8bb9dc1ad14432b96a821f08802ee3.zip frameworks_native-5a8f9012ee8bb9dc1ad14432b96a821f08802ee3.tar.gz frameworks_native-5a8f9012ee8bb9dc1ad14432b96a821f08802ee3.tar.bz2 | |
Tone down a fatal assert
The new disconnectDisplay function doesn't handle virtual displays,
but it may be called for them. Return without doing anything.
Bug 7281786
Change-Id: I62607f2ae6073fa66b393f55932604aeb8e03566
Diffstat (limited to 'services')
| -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); |