Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a71c03e9 authored by Michael Lentine's avatar Michael Lentine Committed by Android Git Automerger
Browse files

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

* commit '7fc3ef0e':
  Add hotplug support for primary display.
parents f61cc005 7fc3ef0e

services/surfaceflinger/DisplayHardware/HWComposer.cpp

+5 −2
Original line number Diff line number Diff line
@@ -305,14 +305,17 @@ 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);

    // 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) {

    // Default density is based on TVs: 1080p displays get XHIGH density,