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

Commit 8650c6fe 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
am: f3fe700d

Change-Id: I13ae45fde822c625cd70b60db6fdbd1e1236a462
parents 41432957 f3fe700d

services/surfaceflinger/SurfaceFlinger.cpp

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

}





int SurfaceFlinger::getActiveConfig(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));

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

    if (device != NULL) {

    if (device != NULL) {

        return device->getActiveConfig();

        return device->getActiveConfig();