ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* commit 'e835976d285df80e261546bd4d016dadb45d906d':
  Tone down a fatal assert
This commit is contained in:
Mathias Agopian 2012-10-04 20:26:52 -07:00 committed by Android Git Automerger
commit 95b9a0b688
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
services/surfaceflinger/DisplayHardware/HWComposer.cpp
View File

@ -686,8 +686,11 @@ status_t HWComposer::acquire(int disp) {
} }
void HWComposer::disconnectDisplay(int disp) { void HWComposer::disconnectDisplay(int disp) {
LOG_ALWAYS_FATAL_IF(disp < 0 || disp == HWC_DISPLAY_PRIMARY || LOG_ALWAYS_FATAL_IF(disp < 0 || disp == HWC_DISPLAY_PRIMARY);
disp >= HWC_NUM_DISPLAY_TYPES); if (disp >= HWC_NUM_DISPLAY_TYPES) {
// nothing to do for these yet
return;
}
DisplayData& dd(mDisplayData[disp]); DisplayData& dd(mDisplayData[disp]);
if (dd.list != NULL) { if (dd.list != NULL) {
free(dd.list); free(dd.list);