summaryrefslogtreecommitdiffstats
path: root/core/java/android/hardware
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2015-03-31 22:27:52 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-03-31 22:27:53 +0000
commit095d99904579a5231d974a2447661c10a8eb621b (patch)
treebdd671ddc91ea215c1d3285f3db565f7bac26843 /core/java/android/hardware
parent4470d68a89725cf9c40b2149e9d895915946d5ff (diff)
parent9d21ee5d7755755cc5695a9d7cea00a05a4b92aa (diff)
downloadframeworks_base-095d99904579a5231d974a2447661c10a8eb621b.zip
frameworks_base-095d99904579a5231d974a2447661c10a8eb621b.tar.gz
frameworks_base-095d99904579a5231d974a2447661c10a8eb621b.tar.bz2
Merge "Add CameraService to system server."
Diffstat (limited to 'core/java/android/hardware')
-rw-r--r--core/java/android/hardware/ICameraService.aidl7
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/hardware/ICameraService.aidl b/core/java/android/hardware/ICameraService.aidl
index d5dfaf6..9bc2f46 100644
--- a/core/java/android/hardware/ICameraService.aidl
+++ b/core/java/android/hardware/ICameraService.aidl
@@ -75,4 +75,11 @@ interface ICameraService
out BinderHolder device);
int setTorchMode(String CameraId, boolean enabled, IBinder clientBinder);
+
+ /**
+ * Notify the camera service of a system event. Should only be called from system_server.
+ *
+ * Callers require the android.permission.CAMERA_SEND_SYSTEM_EVENTS permission.
+ */
+ oneway void notifySystemEvent(int eventId, int arg0);
}