libcameraservice: Remove restrictions for faceunlock service

Change-Id: I6248937629cd8190f46503eef31a1db7c5d54510
DerpFest-Realme7Pro · Apr 17, 2021 · 03cbd83 · 03cbd83
1 parent 35bfdce
commit 03cbd83
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
@@ -2870,6 +2870,10 @@ String16 CameraService::BasicClient::getPackageName() const {
  return mClientPackageName;
 }
 
+bool CameraService::BasicClient::isFaceUnlockPackage() const {
+ std::string cpn = String8(mClientPackageName).string();
+ return cpn.compare("org.pixelexperience.faceunlock") == 0;
+}
 
 int CameraService::BasicClient::getClientPid() const {
  return mClientPid;
@@ -2930,15 +2934,15 @@ status_t CameraService::BasicClient::startCameraOps() {
  mClientPackageName, /*startIfModeDefault*/ false, mClientFeatureId,
  String16("start camera ") + String16(mCameraIdStr));
 
- if (res == AppOpsManager::MODE_ERRORED) {
+ if (!isFaceUnlockPackage() && res == AppOpsManager::MODE_ERRORED) {
  ALOGI("Camera %s: Access for \"%s\" has been revoked",
  mCameraIdStr.string(), String8(mClientPackageName).string());
  return PERMISSION_DENIED;
  }
 
  // If the calling Uid is trusted (a native service), the AppOpsManager could
  // return MODE_IGNORED. Do not treat such case as error.
- if (!mUidIsTrusted && res == AppOpsManager::MODE_IGNORED) {
+ if (!isFaceUnlockPackage() && !mUidIsTrusted && res == AppOpsManager::MODE_IGNORED) {
  ALOGI("Camera %s: Access for \"%s\" has been restricted",
  mCameraIdStr.string(), String8(mClientPackageName).string());
  // Return the same error as for device policy manager rejection

diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h
@@ -295,6 +295,9 @@ class CameraService :
  // Override rotate-and-crop AUTO behavior
  virtual status_t setRotateAndCropOverride(uint8_t rotateAndCrop) = 0;
 
+ // Return if current package is face unlock
+ virtual bool isFaceUnlockPackage() const;
+
  protected:
  BasicClient(const sp<CameraService>& cameraService,
  const sp<IBinder>& remoteCallback,