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

Commit 8ec41c1e authored by Jayant Chowdhary's avatar Jayant Chowdhary
Browse files

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



Bug: 125464062

Test: GCA (sanity)
Test: Connect to a camera device using a HAL process, change the device user and connect again;
      connection is successful

Change-Id: Ia25b961baa396fd383d089e400c6d877b9875955
Signed-off-by: default avatarJayant Chowdhary <jchowdhary@google.com>
parent b8a07acc

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());