commit 8ec41c1ecaf3c29df14276f45e06cc95e54a4f67
author Jayant Chowdhary <jchowdhary@google.com> Thu Feb 21 20:17:22 2019 -0800
committer Jayant Chowdhary <jchowdhary@google.com> Tue Feb 26 12:12:25 2019 -0800
tree 619d5ab78a200aa3a16338f830cbe76da716d1c5
parent b8a07acca4392e1be911dd6a8f88be3ef7265668

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: Jayant Chowdhary <jchowdhary@google.com>

services/camera/libcameraservice/CameraService.cpp

diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index e06897f..e005398 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -972,8 +972,9 @@
     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());