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

Commit ef48c8a6 authored by Kwangkyu Park's avatar Kwangkyu Park Committed by Jayant Chowdhary
Browse files

Camera: Fix use of uninitialized variable 



PermissionResult is printed out to log before it is initialized.
Change code sequence to print out the proper value of variable.

Bug: 387973426
Flag: EXEMPT; Minor logging Bug fix
Test: Manual test with log check
Change-Id: I3da8017ad5a62c4d59711f5738a047e85be29453
Signed-off-by: default avatarJayant Chowdhary <jchowdhary@google.com>
parent 713d77a2

services/camera/libcameraservice/CameraService.cpp

+4 −4
Original line number Diff line number Diff line
@@ -4598,21 +4598,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) {