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

Commit bb557dc1 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: 7bbb37b1

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



Change-Id: I9762296cec6e0da9bfc99890f658e57432b67271
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cf394f4c 7bbb37b1

services/camera/libcameraservice/CameraService.cpp

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


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

        int64_t procStateSeq __unused, int32_t capability __unused) {

    bool procStateChange = false;

    {

        Mutex::Autolock _l(mUidLock);

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

                mMonitoredUids[uid].procState != procState) {

            mMonitoredUids[uid].procState = procState;

            procStateChange = true;

        }

    }



    if (procStateChange) {

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

        if (service != nullptr) {

            service->notifyMonitoredUids();

        }

    }

}