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

Commit 184394ea 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

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



Change-Id: I2bdf56b044c0679d9c96e5e5ca9b6f5b7c3a7ba8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8f259245 f09d60b0

services/camera/libcameraservice/CameraService.cpp

+15 −4
Original line number 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,

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

        }

    }

}