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

Commit 105aa28e authored by Dan Stoza's avatar Dan Stoza Committed by Android Git Automerger
Browse files

am b275b4dc: am 3949f664: Merge "SurfaceFlinger: Fix null pointer exception" 

* commit 'b275b4dc':
  SurfaceFlinger: Fix null pointer exception
parents f11b58f2 b275b4dc

services/surfaceflinger/SurfaceFlinger.cpp

+5 −1
Original line number Diff line number Diff line
@@ -620,7 +620,11 @@ status_t SurfaceFlinger::getDisplayStats(const sp<IBinder>& /* display */, 
}



int SurfaceFlinger::getActiveConfig(const sp<IBinder>& display) {

    return getDisplayDevice(display)->getActiveConfig();

    sp<DisplayDevice> device(getDisplayDevice(display));

    if (device != NULL) {

        return device->getActiveConfig();

    }

    return BAD_VALUE;

}



void SurfaceFlinger::setActiveConfigInternal(const sp<DisplayDevice>& hw, int mode) {