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

Commit cf524a68 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Camera: Fix use of uninitialized variable" into main

parents 9fbd6032 ef48c8a6

services/camera/libcameraservice/CameraService.cpp

+4 −4
Original line number Diff line number Diff line
@@ -4627,21 +4627,21 @@ void CameraService::BasicClient::opChanged(int32_t op, const String16&) { 
                            AppOpsManager::OP_CAMERA, attr.uid,

                            toString16(attr.packageName.value_or(""))));

                });

        ALOGV("checkOp returns: %d, %s ", res,

        res = appOpModeToPermissionResult(appOpMode);

        ALOGV("checkOp returns: %d, %s ", appOpMode,

              appOpMode == AppOpsManager::MODE_ALLOWED   ? "ALLOWED"

              : appOpMode == AppOpsManager::MODE_IGNORED ? "IGNORED"

              : appOpMode == AppOpsManager::MODE_ERRORED ? "ERRORED"

                                                         : "UNKNOWN");

        res = appOpModeToPermissionResult(appOpMode);

    } else {

        int32_t appOpMode = mAppOpsManager->checkOp(AppOpsManager::OP_CAMERA, getClientUid(),

                                                    toString16(getPackageName()));

        ALOGV("checkOp returns: %d, %s ", res,

        res = appOpModeToPermissionResult(appOpMode);

        ALOGV("checkOp returns: %d, %s ", appOpMode,

              appOpMode == AppOpsManager::MODE_ALLOWED   ? "ALLOWED"

              : appOpMode == AppOpsManager::MODE_IGNORED ? "IGNORED"

              : appOpMode == AppOpsManager::MODE_ERRORED ? "ERRORED"

                                                         : "UNKNOWN");

        res = appOpModeToPermissionResult(appOpMode);

    }



    if (res == PermissionChecker::PERMISSION_HARD_DENIED) {