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

Commit f3fe700d 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:... 

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

Change-Id: I5baca403532b095c89838dd0733439c09c430c16
parents 86cd1cad 60f8850e

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();