commit 9bfa0a7bddbc7b7f866bc46faa1f62f0d023c332
author Austin Borger <borgera@google.com> Wed Aug 03 17:50:40 2022 -0700
committer Austin Borger <borgera@google.com> Tue Aug 23 10:39:33 2022 -0700
tree 47d9e13e8108addb33cd1f73c77a2eb14b0fbb91
parent 78122aeef44ea3c92d708ba90aec087bcba42f61

CameraService: Check if the camera is disabled via device policy by user.

The current approach to checking the camera device policy is multi-user
agnostic. This patch takes the user into account.

Test: Tested GCA with device policy set via TestDPC
Bug: 230026863
Change-Id: I3937f75ebfc219906a3c379b6b4cfacd801a40bf

services/camera/libcameraservice/tests/CameraPermissionsTest.cpp

diff --git a/services/camera/libcameraservice/tests/CameraPermissionsTest.cpp b/services/camera/libcameraservice/tests/CameraPermissionsTest.cpp
index 4359f9b..42d99e8 100644
--- a/services/camera/libcameraservice/tests/CameraPermissionsTest.cpp
+++ b/services/camera/libcameraservice/tests/CameraPermissionsTest.cpp
@@ -138,12 +138,12 @@
         return mCameraServiceProxy->notifyCameraState(cameraSessionStats);
     }
 
-    virtual binder::Status isCameraDisabled(bool *ret) override {
+    virtual binder::Status isCameraDisabled(int userId, bool *ret) override {
         if (mOverrideCameraDisabled) {
             *ret = mCameraDisabled;
             return binder::Status::ok();
         }
-        return mCameraServiceProxy->isCameraDisabled(ret);
+        return mCameraServiceProxy->isCameraDisabled(userId, ret);
     }
 
     void setCameraDisabled(bool cameraDisabled) {
@@ -167,7 +167,7 @@
     { }
 
     ~AutoDisconnectDevice() {
-        if (mDevice != nullptr) { 
+        if (mDevice != nullptr) {
             mDevice->disconnect();
         }
     }