summaryrefslogtreecommitdiffstats
path: root/include/camera/Camera.h
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2015-05-12 02:19:27 +0000
committerSvetoslav Ganov <svetoslavganov@google.com>2015-05-12 02:19:27 +0000
commit280405a138a0068694f3c39b4290f510173133d9 (patch)
tree691b6bc4e9a5011b38233f01df9e0486d9ce759a /include/camera/Camera.h
parent32fa6d0e65dbf956e253a1006e9419dce2fe75c9 (diff)
downloadframeworks_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 'include/camera/Camera.h')
-rw-r--r--include/camera/Camera.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/camera/Camera.h b/include/camera/Camera.h
index 25d75f7..2b60842 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& opPackageName,
+ const String16& clientPackageName,
int clientUid);
static status_t connectLegacy(int cameraId, int halVersion,
- const String16& opPackageName,
+ const String16& clientPackageName,
int clientUid, sp<Camera>& camera);
virtual ~Camera();