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

Commit e097f4a2 authored by Jayant Chowdhary's avatar Jayant Chowdhary Committed by Android (Google) Code Review
Browse files

Merge "Allow VNDK 'users' which are not foreground to connect to camera devices."

parents 97214de1 8ec41c1e

services/camera/libcameraservice/CameraService.cpp

+3 −2
Original line number Diff line number Diff line
@@ -972,8 +972,9 @@ Status CameraService::validateClientPermissionsLocked(const String8& cameraId, 
    userid_t clientUserId = multiuser_get_user_id(clientUid);



    // Only allow clients who are being used by the current foreground device user, unless calling

    // from our own process.

    if (callingPid != getpid() && (mAllowedUsers.find(clientUserId) == mAllowedUsers.end())) {

    // from our own process OR the caller is using the cameraserver's HIDL interface.

    if (!hardware::IPCThreadState::self()->isServingCall() && callingPid != getpid() &&

            (mAllowedUsers.find(clientUserId) == mAllowedUsers.end())) {

        ALOGE("CameraService::connect X (PID %d) rejected (cannot connect from "

                "device user %d, currently allowed device users: %s)", callingPid, clientUserId,

                toString(mAllowedUsers).string());