diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2015-05-12 02:19:27 +0000 |
|---|---|---|
| committer | Svetoslav Ganov <svetoslavganov@google.com> | 2015-05-12 02:19:27 +0000 |
| commit | 280405a138a0068694f3c39b4290f510173133d9 (patch) | |
| tree | 691b6bc4e9a5011b38233f01df9e0486d9ce759a /camera/Camera.cpp | |
| parent | 32fa6d0e65dbf956e253a1006e9419dce2fe75c9 (diff) | |
| download | frameworks_av-280405a138a0068694f3c39b4290f510173133d9.zip frameworks_av-280405a138a0068694f3c39b4290f510173133d9.tar.gz frameworks_av-280405a138a0068694f3c39b4290f510173133d9.tar.bz2 | |
Revert "Add camera app op - camera"
This is not needed duplication of work
This reverts commit 32fa6d0e65dbf956e253a1006e9419dce2fe75c9.
Change-Id: I2c81b0dacb2ed99c408c79c1f9e22a4baa564494
Diffstat (limited to 'camera/Camera.cpp')
| -rw-r--r-- | camera/Camera.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/camera/Camera.cpp b/camera/Camera.cpp index 84e0d1c..3a9fb4c 100644 --- a/camera/Camera.cpp +++ b/camera/Camera.cpp @@ -71,13 +71,14 @@ Camera::~Camera() // deadlock if we call any method of ICamera here. } -sp<Camera> Camera::connect(int cameraId, const String16& opPackageName, int clientUid) +sp<Camera> Camera::connect(int cameraId, const String16& clientPackageName, + int clientUid) { - return CameraBaseT::connect(cameraId, opPackageName, clientUid); + return CameraBaseT::connect(cameraId, clientPackageName, clientUid); } status_t Camera::connectLegacy(int cameraId, int halVersion, - const String16& opPackageName, + const String16& clientPackageName, int clientUid, sp<Camera>& camera) { @@ -88,7 +89,7 @@ status_t Camera::connectLegacy(int cameraId, int halVersion, const sp<ICameraService>& cs = CameraBaseT::getCameraService(); if (cs != 0) { - status = cs.get()->connectLegacy(cl, cameraId, halVersion, opPackageName, + status = cs.get()->connectLegacy(cl, cameraId, halVersion, clientPackageName, clientUid, /*out*/c->mCamera); } if (status == OK && c->mCamera != 0) { |