commit 2c656796f416401ae48cd4a2e313dcb9e3aa256b
author Shuzhen Wang <shuzhenwang@google.com> Mon Apr 13 17:36:49 2020 -0700
committer Shuzhen Wang <shuzhenwang@google.com> Tue Apr 14 09:39:35 2020 -0700
tree 32f9cfe2e8d6fa552d24a5c1c9bbbafb6607a3f5
parent 7e540682b362a3e8679e274084aeaefdf01314da

Camera: Handle the case of calling Uid being cameraserver

With HAL1-camera2 legacy implementation, the getCameraCharacteristics
may be called without camera permission. So the cameraserver's Uid is
used in that case.

AppOpsManager returns MODE_IGNORED when the cameraserver's Uid is passed.
Do not treat this as an error case.

Bug: 153511543
Test: On Pixel 2 device, run "adb root; adb shell setprop
persist.camera.HAL3.enabled 0; adb reboot", then "atest
cts/tests/camera/CaptureRequestTest"

Change-Id: I29aaa2045b14233537c737bf0738fbc32422540e

services/camera/libcameraservice/CameraService.h

diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h
index 1adf15a..18cf77a 100644
--- a/services/camera/libcameraservice/CameraService.h
+++ b/services/camera/libcameraservice/CameraService.h
@@ -323,6 +323,7 @@
         const uid_t                     mClientUid;
         const pid_t                     mServicePid;
         bool                            mDisconnected;
+        bool                            mUidIsTrusted;
 
         mutable Mutex                   mAudioRestrictionLock;
         int32_t                         mAudioRestriction;