diff options
| author | Svet Ganov <svetoslavganov@google.com> | 2015-05-01 20:47:20 -0700 |
|---|---|---|
| committer | Svet Ganov <svetoslavganov@google.com> | 2015-05-02 17:18:47 -0700 |
| commit | 32fa6d0e65dbf956e253a1006e9419dce2fe75c9 (patch) | |
| tree | 35bdbc743172f28de3167d7b800a6084e5c9c58d /include/camera | |
| parent | 4068b1392b18d9f0d9e866b50d716e2ef8dfa37c (diff) | |
| download | frameworks_av-32fa6d0e65dbf956e253a1006e9419dce2fe75c9.zip frameworks_av-32fa6d0e65dbf956e253a1006e9419dce2fe75c9.tar.gz frameworks_av-32fa6d0e65dbf956e253a1006e9419dce2fe75c9.tar.bz2 | |
Add camera app op - camera
Change-Id: I26570cc0a23fdea740b416a26838d40cac296c85
Diffstat (limited to 'include/camera')
| -rw-r--r-- | include/camera/Camera.h | 4 | ||||
| -rw-r--r-- | include/camera/ICameraService.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/camera/Camera.h b/include/camera/Camera.h index 2b60842..25d75f7 100644 --- a/include/camera/Camera.h +++ b/include/camera/Camera.h @@ -71,11 +71,11 @@ public: // construct a camera client from an existing remote static sp<Camera> create(const sp<ICamera>& camera); static sp<Camera> connect(int cameraId, - const String16& clientPackageName, + const String16& opPackageName, int clientUid); static status_t connectLegacy(int cameraId, int halVersion, - const String16& clientPackageName, + const String16& opPackageName, int clientUid, sp<Camera>& camera); virtual ~Camera(); diff --git a/include/camera/ICameraService.h b/include/camera/ICameraService.h index cad275e..38bff3e 100644 --- a/include/camera/ICameraService.h +++ b/include/camera/ICameraService.h @@ -109,7 +109,7 @@ public: */ virtual status_t connect(const sp<ICameraClient>& cameraClient, int cameraId, - const String16& clientPackageName, + const String16& opPackageName, int clientUid, /*out*/ sp<ICamera>& device) = 0; @@ -117,7 +117,7 @@ public: virtual status_t connectDevice( const sp<ICameraDeviceCallbacks>& cameraCb, int cameraId, - const String16& clientPackageName, + const String16& opPackageName, int clientUid, /*out*/ sp<ICameraDeviceUser>& device) = 0; @@ -141,7 +141,7 @@ public: */ virtual status_t connectLegacy(const sp<ICameraClient>& cameraClient, int cameraId, int halVersion, - const String16& clientPackageName, + const String16& opPackageName, int clientUid, /*out*/ sp<ICamera>& device) = 0; |