summaryrefslogtreecommitdiffstats
path: root/services/camera/libcameraservice/CameraService.h
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2015-08-20 17:08:32 -0700
committerEino-Ville Talvala <etalvala@google.com>2015-08-21 17:41:43 -0700
commit412fe56cd7cf7d73bc5d2bcc3f635bc650d18de9 (patch)
tree919a0a09510d53e39c23126f7d4760d761d954d6 /services/camera/libcameraservice/CameraService.h
parent37ea1d0de9b7c9ffbfa7cb1895dcbf4a4f92803a (diff)
downloadframeworks_av-412fe56cd7cf7d73bc5d2bcc3f635bc650d18de9.zip
frameworks_av-412fe56cd7cf7d73bc5d2bcc3f635bc650d18de9.tar.gz
frameworks_av-412fe56cd7cf7d73bc5d2bcc3f635bc650d18de9.tar.bz2
CameraService: Notify camera service proxy of device status
Send the camera proxy service in system server updates to camera device state: opened/closed/active/idle. Bug: 23393557 Change-Id: Id7c70f134821efa34af8f6e7b4caa4c2ab128ebc
Diffstat (limited to 'services/camera/libcameraservice/CameraService.h')
-rw-r--r--services/camera/libcameraservice/CameraService.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h
index 7f4d43f..894767a 100644
--- a/services/camera/libcameraservice/CameraService.h
+++ b/services/camera/libcameraservice/CameraService.h
@@ -24,6 +24,7 @@
#include <binder/BinderService.h>
#include <binder/IAppOpsCallback.h>
#include <camera/ICameraService.h>
+#include <camera/ICameraServiceProxy.h>
#include <hardware/camera.h>
#include <camera/ICamera.h>
@@ -164,6 +165,14 @@ public:
void playSound(sound_kind kind);
void releaseSound();
+ /**
+ * Update the state of a given camera device (open/close/active/idle) with
+ * the camera proxy service in the system service
+ */
+ static void updateProxyDeviceState(
+ ICameraServiceProxy::CameraState newState,
+ const String8& cameraId);
+
/////////////////////////////////////////////////////////////////////
// CameraDeviceFactory functionality
int getDeviceVersion(int cameraId, int* facing = NULL);
@@ -728,6 +737,7 @@ private:
static String8 toString(std::set<userid_t> intSet);
+ static sp<ICameraServiceProxy> getCameraServiceProxy();
static void pingCameraServiceProxy();
};