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

Commit f0d6d1eb authored by Austin Borger's avatar Austin Borger Committed by Automerger Merge Worker
Browse files

Merge "Revert "Remove redundant calls to onCameraAccessPrioritiesChanged.""... 

Merge "Revert "Remove redundant calls to onCameraAccessPrioritiesChanged."" into tm-dev am: f09d60b0 am: c7037638 am: 878db42e

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



Change-Id: I6d9b47041b02aa4b0bd2347f1aefe7b3ca7071d0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 86ed5273 878db42e

services/camera/libcameraservice/CameraService.cpp

+15 −4
Original line number Original line Diff line number Diff line
@@ -3723,10 +3723,21 @@ void CameraService::UidPolicy::onUidIdle(uid_t uid, bool /* disabled */) { 




void CameraService::UidPolicy::onUidStateChanged(uid_t uid, int32_t procState,

void CameraService::UidPolicy::onUidStateChanged(uid_t uid, int32_t procState,

        int64_t procStateSeq __unused, int32_t capability __unused) {

        int64_t procStateSeq __unused, int32_t capability __unused) {

    bool procStateChange = false;

    {

        Mutex::Autolock _l(mUidLock);

        Mutex::Autolock _l(mUidLock);

        if (mMonitoredUids.find(uid) != mMonitoredUids.end() &&

        if (mMonitoredUids.find(uid) != mMonitoredUids.end() &&

                mMonitoredUids[uid].procState != procState) {

                mMonitoredUids[uid].procState != procState) {

            mMonitoredUids[uid].procState = procState;

            mMonitoredUids[uid].procState = procState;

            procStateChange = true;

        }

    }



    if (procStateChange) {

        sp<CameraService> service = mService.promote();

        if (service != nullptr) {

            service->notifyMonitoredUids();

        }

    }

    }

}

}