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

Commit 9a4e759c authored by Leon Scroggins's avatar Leon Scroggins Committed by Automerger Merge Worker
Browse files

Merge "Temporary workaround for getDisplayStats" into udc-dev am: 61608cc7 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/22530953



Change-Id: I22715f780f71f9a3009ca0f7c04557c7a13e2e5b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 54cc86c6 61608cc7

services/surfaceflinger/SurfaceFlinger.cpp

+4 −1
Original line number Original line Diff line number Diff line
@@ -1149,7 +1149,10 @@ status_t SurfaceFlinger::getDisplayStats(const sp<IBinder>& displayToken, 
        displayIdOpt = getPhysicalDisplayIdLocked(displayToken);

        displayIdOpt = getPhysicalDisplayIdLocked(displayToken);

    }

    }





    if (!displayIdOpt) {

    // TODO (b/277364366): Clients should be updated to pass in the display they

    // want, rather than us picking an arbitrary one (the pacesetter, in this

    // case).

    if (displayToken && !displayIdOpt) {

        ALOGE("%s: Invalid physical display token %p", __func__, displayToken.get());

        ALOGE("%s: Invalid physical display token %p", __func__, displayToken.get());

        return NAME_NOT_FOUND;

        return NAME_NOT_FOUND;

    }

    }