Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28e8ef72 authored by Svetoslav's avatar Svetoslav Committed by Svetoslav Ganov
Browse files

Fail gracefully when camera app op is not enabled. 

Change-Id: I0c7c1dca1c0966efaf30bcfe12636953683712ab
parent 7e31a871

services/camera/libcameraservice/CameraService.cpp

+7 −1
Original line number Diff line number Diff line
@@ -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