diff options
Diffstat (limited to 'services/camera/libcameraservice/CameraService.cpp')
| -rw-r--r-- | services/camera/libcameraservice/CameraService.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index fcccd262fe..0b1b827cf5 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -2891,6 +2891,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; @@ -2951,7 +2955,7 @@ 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; @@ -2959,7 +2963,7 @@ status_t CameraService::BasicClient::startCameraOps() { // 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 |