commit 7939aee8c1688bc8647c5bceb0d47a4e790ff27d
author Chien-Yu Chen <cychen@google.com> Mon Mar 21 18:19:33 2016 -0700
committer Chien-Yu Chen <cychen@google.com> Mon Mar 21 18:39:47 2016 -0700
tree 61ad95847a53290e813b12e4bd0442098eaf5e5b
parent 9b8e05d33167864a3dd46df13988e1ae57afb249
parent d384306b8a5c2f106a02574c356d78a08e7894ac

resolve merge conflicts of d384306 to nyc-dev-plus-aosp

Change-Id: I288ea4c7b2f750460e8fb0fbcf8ecaebec3f2d53

services/camera/libcameraservice/CameraService.cpp

diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index eacde99..007629d 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -914,10 +914,12 @@
 }
 
 Status CameraService::validateConnectLocked(const String8& cameraId,
-        const String8& clientName8, /*inout*/int& clientUid, /*inout*/int& clientPid) const {
+        const String8& clientName8, /*inout*/int& clientUid, /*inout*/int& clientPid,
+        /*out*/int& originalClientPid) const {
 
 #if !defined(__BRILLO__)
-    Status allowed = validateClientPermissionsLocked(cameraId, clientName8, clientUid, clientPid);
+    Status allowed = validateClientPermissionsLocked(cameraId, clientName8, clientUid, clientPid,
+            originalClientPid);
     if (!allowed.isOk()) {
         return allowed;
     }
@@ -955,7 +957,8 @@
 }
 
 Status CameraService::validateClientPermissionsLocked(const String8& cameraId,
-        const String8& clientName8, int& clientUid, int& clientPid) const {
+        const String8& clientName8, int& clientUid, int& clientPid,
+        /*out*/int& originalClientPid) const {
     int callingPid = getCallingPid();
     int callingUid = getCallingUid();
 
@@ -994,6 +997,8 @@
                 clientName8.string(), clientUid, clientPid, cameraId.string());
     }
 
+    originalClientPid = clientPid;
+
     userid_t clientUserId = multiuser_get_user_id(clientUid);
 
     // Only allow clients who are being used by the current foreground device user, unless calling