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/CameraBase.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/CameraBase.cpp')
| -rw-r--r-- | camera/CameraBase.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/camera/CameraBase.cpp b/camera/CameraBase.cpp index 0dc0276..5d50aa8 100644 --- a/camera/CameraBase.cpp +++ b/camera/CameraBase.cpp @@ -91,7 +91,7 @@ const sp<ICameraService>& CameraBase<TCam, TCamTraits>::getCameraService() template <typename TCam, typename TCamTraits> sp<TCam> CameraBase<TCam, TCamTraits>::connect(int cameraId, - const String16& opPackageName, + const String16& clientPackageName, int clientUid) { ALOGV("%s: connect", __FUNCTION__); @@ -102,7 +102,7 @@ sp<TCam> CameraBase<TCam, TCamTraits>::connect(int cameraId, if (cs != 0) { TCamConnectService fnConnectService = TCamTraits::fnConnectService; - status = (cs.get()->*fnConnectService)(cl, cameraId, opPackageName, clientUid, + status = (cs.get()->*fnConnectService)(cl, cameraId, clientPackageName, clientUid, /*out*/ c->mCamera); } if (status == OK && c->mCamera != 0) { |