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

Commit 67d5fc6b authored by Dave Sparks's avatar Dave Sparks Committed by The Android Open Source Project
Browse files

am 7283fb18: Merge commit \'7b7225c8\' into manual_merge 

Merge commit '7283fb18'

* commit '7283fb18':
  AI 149133: Enable the camera permission check.
parents 51ec709a 7283fb18

camera/libcameraservice/CameraService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1084,7 +1084,6 @@ status_t CameraService::onTransact( 
    status_t err = BnCameraService::onTransact(code, data, reply, flags);



#if DEBUG_HEAP_LEAKS



    LOGD("+++ onTransact err %d code %d", err, code);



    if (err == UNKNOWN_TRANSACTION || err == PERMISSION_DENIED) {
@@ -1121,6 +1120,7 @@ status_t CameraService::onTransact( 
        }

    }

#endif // DEBUG_HEAP_LEAKS



    return err;

}