resolve merge conflicts of c25621f0e5 to nyc-dev-plus-aosp
Change-Id: I36983f261e91f9fc1b41ff54ba604fa616ada0ff
diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h
index 66de77f..5616838 100644
--- a/services/camera/libcameraservice/CameraService.h
+++ b/services/camera/libcameraservice/CameraService.h
@@ -490,6 +490,8 @@
// Check if we can connect, before we acquire the service lock.
status_t validateConnectLocked(const String8& cameraId, /*inout*/int& clientUid,
/*inout*/int& clientPid) const;
+ status_t validateClientPermissionsLocked(const String8& cameraId, /*inout*/int& clientUid,
+ /*inout*/int& clientPid) const;
// Handle active client evictions, and update service state.
// Only call with with mServiceLock held.