From 28e8ef72dab287af59663b89b12507e43f760701 Mon Sep 17 00:00:00 2001 From: Svetoslav Date: Mon, 11 May 2015 19:21:31 -0700 Subject: Fail gracefully when camera app op is not enabled. Change-Id: I0c7c1dca1c0966efaf30bcfe12636953683712ab --- services/camera/libcameraservice/CameraService.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'services/camera/libcameraservice') diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index e28464d..8de8930 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -1777,12 +1777,18 @@ status_t CameraService::BasicClient::startCameraOps() { res = mAppOpsManager.startOp(AppOpsManager::OP_CAMERA, mClientUid, mClientPackageName); - if (res != AppOpsManager::MODE_ALLOWED) { + if (res == AppOpsManager::MODE_ERRORED) { ALOGI("Camera %d: Access for \"%s\" has been revoked", mCameraId, String8(mClientPackageName).string()); return PERMISSION_DENIED; } + if (res == AppOpsManager::MODE_IGNORED) { + ALOGI("Camera %d: Access for \"%s\" has been restricted", + mCameraId, String8(mClientPackageName).string()); + return INVALID_OPERATION; + } + mOpsActive = true; // Transition device availability listeners from PRESENT -> NOT_AVAILABLE -- cgit v1.1