commit f09d60b072703d7e979a3aad45e5b8d1f490ca9a
author Austin Borger <borgera@google.com> Thu May 12 23:49:32 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 12 23:49:32 2022 +0000
tree e0c15f7e207e102c2598195e3c5f3b1c9b07a1ce
parent f8ec839056b57e496dba034f9d1e5840badf5acf
parent c5585dc3189a2a72298c9abfef0f0a37bfc34337

Merge "Revert "Remove redundant calls to onCameraAccessPrioritiesChanged."" into tm-dev

services/camera/libcameraservice/CameraService.cpp

diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index 3702812..c4b5a6c 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -3723,10 +3723,21 @@
 
 void CameraService::UidPolicy::onUidStateChanged(uid_t uid, int32_t procState,
         int64_t procStateSeq __unused, int32_t capability __unused) {
-    Mutex::Autolock _l(mUidLock);
-    if (mMonitoredUids.find(uid) != mMonitoredUids.end() &&
-            mMonitoredUids[uid].procState != procState) {
-        mMonitoredUids[uid].procState = procState;
+    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();
+        }
     }
 }