summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorIgor Murashkin <iam@google.com>2013-06-11 20:44:58 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-06-11 20:44:58 +0000
commit31295e781598929a75d5774814a25f5f22b78236 (patch)
tree8e7a0c6cdcb67f71ea4033c8aa76965c0d4e4d6b /include
parent5e07157c8f69030b4f9bdabded76f84fd4c91fd7 (diff)
parentbef3f23f16f2fc575b3f425febcfcc436a7db70f (diff)
downloadframeworks_av-31295e781598929a75d5774814a25f5f22b78236.zip
frameworks_av-31295e781598929a75d5774814a25f5f22b78236.tar.gz
frameworks_av-31295e781598929a75d5774814a25f5f22b78236.tar.bz2
Merge "camera: Make some binder interfaces compatible with AIDL"
Diffstat (limited to 'include')
-rw-r--r--include/camera/ICamera.h3
-rw-r--r--include/camera/ICameraClient.h3
-rw-r--r--include/camera/ICameraService.h3
-rw-r--r--include/camera/ICameraServiceListener.h3
-rw-r--r--include/camera/IProCameraCallbacks.h3
-rw-r--r--include/camera/IProCameraUser.h3
6 files changed, 18 insertions, 0 deletions
diff --git a/include/camera/ICamera.h b/include/camera/ICamera.h
index b2125bd..f3a186e 100644
--- a/include/camera/ICamera.h
+++ b/include/camera/ICamera.h
@@ -32,6 +32,9 @@ class Surface;
class ICamera: public IInterface
{
+ /**
+ * Keep up-to-date with ICamera.aidl in frameworks/base
+ */
public:
DECLARE_META_INTERFACE(Camera);
diff --git a/include/camera/ICameraClient.h b/include/camera/ICameraClient.h
index b30aa7a..1584dba 100644
--- a/include/camera/ICameraClient.h
+++ b/include/camera/ICameraClient.h
@@ -28,6 +28,9 @@ namespace android {
class ICameraClient: public IInterface
{
+ /**
+ * Keep up-to-date with ICameraClient.aidl in frameworks/base
+ */
public:
DECLARE_META_INTERFACE(CameraClient);
diff --git a/include/camera/ICameraService.h b/include/camera/ICameraService.h
index aaf6eb3..3c2e60a 100644
--- a/include/camera/ICameraService.h
+++ b/include/camera/ICameraService.h
@@ -32,6 +32,9 @@ class ICameraServiceListener;
class ICameraService : public IInterface
{
public:
+ /**
+ * Keep up-to-date with ICameraService.aidl in frameworks/base
+ */
enum {
GET_NUMBER_OF_CAMERAS = IBinder::FIRST_CALL_TRANSACTION,
GET_CAMERA_INFO,
diff --git a/include/camera/ICameraServiceListener.h b/include/camera/ICameraServiceListener.h
index f2a11c2..0a0e43a 100644
--- a/include/camera/ICameraServiceListener.h
+++ b/include/camera/ICameraServiceListener.h
@@ -26,6 +26,9 @@ namespace android {
class ICameraServiceListener : public IInterface
{
+ /**
+ * Keep up-to-date with ICameraServiceListener.aidl in frameworks/base
+ */
public:
/**
diff --git a/include/camera/IProCameraCallbacks.h b/include/camera/IProCameraCallbacks.h
index 563ec17..c774698 100644
--- a/include/camera/IProCameraCallbacks.h
+++ b/include/camera/IProCameraCallbacks.h
@@ -30,6 +30,9 @@ namespace android {
class IProCameraCallbacks : public IInterface
{
+ /**
+ * Keep up-to-date with IProCameraCallbacks.aidl in frameworks/base
+ */
public:
DECLARE_META_INTERFACE(ProCameraCallbacks);
diff --git a/include/camera/IProCameraUser.h b/include/camera/IProCameraUser.h
index 45b818c..2ccc4d2 100644
--- a/include/camera/IProCameraUser.h
+++ b/include/camera/IProCameraUser.h
@@ -34,6 +34,9 @@ class Surface;
class IProCameraUser: public IInterface
{
+ /**
+ * Keep up-to-date with IProCameraUser.aidl in frameworks/base
+ */
public:
DECLARE_META_INTERFACE(ProCameraUser);