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

am 7fc3ef0e: Merge "Add hotplug support for primary display." into mnc-dev 

* commit '7fc3ef0eb0077eedaa09a7b505b6ec067e814170':
  Add hotplug support for primary display.
This commit is contained in:
Michael Lentine 2015-05-27 20:24:54 +00:00 committed by Android Git Automerger
parent f61cc00527 7fc3ef0eb0
commit a71c03e9fa
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

@ -305,13 +305,16 @@ void HWComposer::vsync(int disp, int64_t timestamp) {
}
void HWComposer::hotplug(int disp, int connected) {
if (disp == HWC_DISPLAY_PRIMARY || disp >= VIRTUAL_DISPLAY_ID_BASE) {
if (disp >= VIRTUAL_DISPLAY_ID_BASE) {
ALOGE("hotplug event received for invalid display: disp=%d connected=%d",
disp, connected);
return;
}
queryDisplayProperties(disp);
mEventHandler.onHotplugReceived(disp, bool(connected));
// Do not teardown or recreate the primary display
if (disp != HWC_DISPLAY_PRIMARY) {
mEventHandler.onHotplugReceived(disp, bool(connected));
}
}
static float getDefaultDensity(uint32_t width, uint32_t height) {