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

Commit 24a42e9f authored by Dan Stoza's avatar Dan Stoza
Browse files

SurfaceFlinger: Fix null pointer exception 

Fixes a null pointer exception in getActiveConfig

Bug: 19416124
Change-Id: I45a01f67affb63a348866ce42a6013c5eb71fe8f
parent 5fec7915

services/surfaceflinger/SurfaceFlinger.cpp

+5 −1
Original line number Diff line number Diff line
@@ -617,7 +617,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) {