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

Commit 5568e2e8 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Ricardo Cerqueira
Browse files

DO NOT MERGE: CameraService: Fix permissions check issues 

Bug: 15677063
Change-Id: I012c111fff90fefd9eb0fef7c9d6034f00c9c6df
parent 248986c0

services/camera/libcameraservice/CameraService.cpp

+5 −4
Original line number Diff line number Diff line
@@ -542,8 +542,8 @@ status_t CameraService::connectPro( 
          case CAMERA_DEVICE_API_VERSION_2_0:

          case CAMERA_DEVICE_API_VERSION_2_1:

          case CAMERA_DEVICE_API_VERSION_3_0:

            client = new ProCamera2Client(this, cameraCb, String16(),

                    cameraId, facing, callingPid, USE_CALLING_UID, getpid());

            client = new ProCamera2Client(this, cameraCb, clientPackageName,

                    cameraId, facing, callingPid, clientUid, getpid());

            break;

          case -1:

            ALOGE("Invalid camera id %d", cameraId);
@@ -620,8 +620,8 @@ status_t CameraService::connectDevice( 
          case CAMERA_DEVICE_API_VERSION_2_0:

          case CAMERA_DEVICE_API_VERSION_2_1:

          case CAMERA_DEVICE_API_VERSION_3_0:

            client = new CameraDeviceClient(this, cameraCb, String16(),

                    cameraId, facing, callingPid, USE_CALLING_UID, getpid());

            client = new CameraDeviceClient(this, cameraCb, clientPackageName,

                    cameraId, facing, callingPid, clientUid, getpid());

            break;

          case -1:

            ALOGE("Invalid camera id %d", cameraId);
@@ -835,6 +835,7 @@ status_t CameraService::onTransact( 
    switch (code) {

        case BnCameraService::CONNECT:

        case BnCameraService::CONNECT_PRO:

        case BnCameraService::CONNECT_DEVICE:

            const int pid = getCallingPid();

            const int self_pid = getpid();

            if (pid != self_pid) {