summaryrefslogtreecommitdiffstats
path: root/core/java/android/hardware/ICameraService.aidl
diff options
context:
space:
mode:
authorSvetoslav <svetoslavganov@google.com>2015-05-03 00:41:49 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-03 00:41:50 +0000
commite9fc4cda50664558028b79edd1f4b893cd4f52d3 (patch)
treebe8bde30269f2b7771d8ce479eaa52a660ce9441 /core/java/android/hardware/ICameraService.aidl
parent5ba44affe6747d2995030005bd99471d621d6e79 (diff)
parentfbf0ecabac5d7a929628b43ffe8f4f953e47bd54 (diff)
downloadframeworks_base-e9fc4cda50664558028b79edd1f4b893cd4f52d3.zip
frameworks_base-e9fc4cda50664558028b79edd1f4b893cd4f52d3.tar.gz
frameworks_base-e9fc4cda50664558028b79edd1f4b893cd4f52d3.tar.bz2
Merge "Add camera app op - framework" into mnc-dev
Diffstat (limited to 'core/java/android/hardware/ICameraService.aidl')
-rw-r--r--core/java/android/hardware/ICameraService.aidl6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/hardware/ICameraService.aidl b/core/java/android/hardware/ICameraService.aidl
index 9bc2f46..7b96e20 100644
--- a/core/java/android/hardware/ICameraService.aidl
+++ b/core/java/android/hardware/ICameraService.aidl
@@ -38,13 +38,13 @@ interface ICameraService
int getCameraInfo(int cameraId, out CameraInfo info);
int connect(ICameraClient client, int cameraId,
- String clientPackageName,
+ String opPackageName,
int clientUid,
// Container for an ICamera object
out BinderHolder device);
int connectDevice(ICameraDeviceCallbacks callbacks, int cameraId,
- String clientPackageName,
+ String opPackageName,
int clientUid,
// Container for an ICameraDeviceUser object
out BinderHolder device);
@@ -69,7 +69,7 @@ interface ICameraService
int connectLegacy(ICameraClient client, int cameraId,
int halVersion,
- String clientPackageName,
+ String opPackageName,
int clientUid,
// Container for an ICamera object
out BinderHolder device);