diff options
| author | Svetoslav <svetoslavganov@google.com> | 2015-05-03 00:41:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-03 00:41:50 +0000 |
| commit | e9fc4cda50664558028b79edd1f4b893cd4f52d3 (patch) | |
| tree | be8bde30269f2b7771d8ce479eaa52a660ce9441 /core/java/android/hardware | |
| parent | 5ba44affe6747d2995030005bd99471d621d6e79 (diff) | |
| parent | fbf0ecabac5d7a929628b43ffe8f4f953e47bd54 (diff) | |
| download | frameworks_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')
| -rw-r--r-- | core/java/android/hardware/Camera.java | 5 | ||||
| -rw-r--r-- | core/java/android/hardware/ICameraService.aidl | 6 | ||||
| -rw-r--r-- | core/java/android/hardware/camera2/CameraManager.java | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index d88594d..1fc69c0 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -460,9 +460,8 @@ public class Camera { mEventHandler = null; } - String packageName = ActivityThread.currentPackageName(); - - return native_setup(new WeakReference<Camera>(this), cameraId, halVersion, packageName); + return native_setup(new WeakReference<Camera>(this), cameraId, halVersion, + ActivityThread.currentOpPackageName()); } private int cameraInitNormal(int cameraId) { 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); diff --git a/core/java/android/hardware/camera2/CameraManager.java b/core/java/android/hardware/camera2/CameraManager.java index e2d2f61..9327f00 100644 --- a/core/java/android/hardware/camera2/CameraManager.java +++ b/core/java/android/hardware/camera2/CameraManager.java @@ -314,7 +314,7 @@ public final class CameraManager { "Camera service is currently unavailable"); } cameraService.connectDevice(callbacks, id, - mContext.getPackageName(), USE_CALLING_UID, holder); + mContext.getOpPackageName(), USE_CALLING_UID, holder); cameraUser = ICameraDeviceUser.Stub.asInterface(holder.getBinder()); } else { // Use legacy camera implementation for HAL1 devices |