summaryrefslogtreecommitdiffstats
path: root/core/java/android/hardware
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2015-05-15 01:45:18 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-15 01:45:19 +0000
commit096c11dc3795120dbc75cc1ee15abaa019fb74d1 (patch)
tree8bf308f4266981f57fec4b6ec8dc6bf202d72728 /core/java/android/hardware
parent8309a19181151a78a288368becd3d3a9b1b1e389 (diff)
parent7f75da2405cd910854448bb3801f776e036f926a (diff)
downloadframeworks_base-096c11dc3795120dbc75cc1ee15abaa019fb74d1.zip
frameworks_base-096c11dc3795120dbc75cc1ee15abaa019fb74d1.tar.gz
frameworks_base-096c11dc3795120dbc75cc1ee15abaa019fb74d1.tar.bz2
Merge "camera2: Fix work-profile eviction handling." into mnc-dev
Diffstat (limited to 'core/java/android/hardware')
-rw-r--r--core/java/android/hardware/ICameraService.aidl2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/hardware/ICameraService.aidl b/core/java/android/hardware/ICameraService.aidl
index 7b96e20..9201b61 100644
--- a/core/java/android/hardware/ICameraService.aidl
+++ b/core/java/android/hardware/ICameraService.aidl
@@ -81,5 +81,5 @@ interface ICameraService
*
* Callers require the android.permission.CAMERA_SEND_SYSTEM_EVENTS permission.
*/
- oneway void notifySystemEvent(int eventId, int arg0);
+ oneway void notifySystemEvent(int eventId, in int[] args);
}