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

Commit 60f8850e authored by Jinguang Dong's avatar Jinguang Dong Committed by android-build-merger
Browse files

Merge "surfaceflinger:Fix potential crash issue when do AIDL FUZZ test" am: 2792ff45 

am: 83f8bba2

Change-Id: Ie5a2b0f7cc37092618a7d35083cf53bf9f7f4212
parents 95df778f 83f8bba2

services/surfaceflinger/SurfaceFlinger.cpp

+4 −0
Original line number Diff line number Diff line
@@ -656,6 +656,10 @@ status_t SurfaceFlinger::getDisplayStats(const sp<IBinder>& /* display */, 
}



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

    if (display == NULL) {

        ALOGE("%s : display is NULL", __func__);

        return BAD_VALUE;

    }

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

    if (device != NULL) {

        return device->getActiveConfig();