commit 3a609147811105d40766f8f8f5904bf71cb123cb
author Eino-Ville Talvala <etalvala@google.com> Tue Jul 31 14:36:26 2012 -0700
committer Eino-Ville Talvala <etalvala@google.com> Thu Aug 02 16:51:48 2012 -0700
tree 27cc2e751e60d6daf4960efe47a3bc035376887c
parent 428b77a2b94b74665a47375b3fdb893b98d71269

Camera2: Check PIDs to ensure camera exclusive access.

Bug: 6243944
Change-Id: I4b36af2c92b7266a4aa896a2b048c56b6406cb9a

services/camera/libcameraservice/Camera2Client.h

diff --git a/services/camera/libcameraservice/Camera2Client.h b/services/camera/libcameraservice/Camera2Client.h
index 3494114..8ae16a4 100644
--- a/services/camera/libcameraservice/Camera2Client.h
+++ b/services/camera/libcameraservice/Camera2Client.h
@@ -72,7 +72,7 @@
 
 private:
     enum State {
-        NOT_INITIALIZED,
+        DISCONNECTED,
         STOPPED,
         WAITING_FOR_PREVIEW_WINDOW,
         PREVIEW,
@@ -302,6 +302,9 @@
 
     /** Utility members */
 
+    // Verify that caller is the owner of the camera
+    status_t checkPid(const char *checkLocation) const;
+
     // Utility class for managing a set of IMemory blocks
     class Camera2Heap : public RefBase {
     public: