commit 34eb60a114c5a8c5466562e09d214ff264e3f571
author Austin Borger <borgera@google.com> Mon May 02 20:23:13 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 02 20:23:13 2022 +0000
tree 1b5151e62e21f65a85f0de4a920601f136816528
parent 5008953a15265f1017441c870416dba979d19873
parent 03befa0c12839996299b27e172840b082f30b57f

Merge "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 a965080..c8c6b1c 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -3717,21 +3717,10 @@
 
 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();
-        }
+    Mutex::Autolock _l(mUidLock);
+    if (mMonitoredUids.find(uid) != mMonitoredUids.end() &&
+            mMonitoredUids[uid].procState != procState) {
+        mMonitoredUids[uid].procState = procState;
     }
 }