commit 32fa6d0e65dbf956e253a1006e9419dce2fe75c9
author Svet Ganov <svetoslavganov@google.com> Fri May 01 20:47:20 2015 -0700
committer Svet Ganov <svetoslavganov@google.com> Sat May 02 17:18:47 2015 -0700
tree 35bdbc743172f28de3167d7b800a6084e5c9c58d
parent 4068b1392b18d9f0d9e866b50d716e2ef8dfa37c

Add camera app op - camera

Change-Id: I26570cc0a23fdea740b416a26838d40cac296c85

camera/Camera.cpp

diff --git a/camera/Camera.cpp b/camera/Camera.cpp
index 3a9fb4c..84e0d1c 100644
--- a/camera/Camera.cpp
+++ b/camera/Camera.cpp
@@ -71,14 +71,13 @@
     // deadlock if we call any method of ICamera here.
 }
 
-sp<Camera> Camera::connect(int cameraId, const String16& clientPackageName,
-        int clientUid)
+sp<Camera> Camera::connect(int cameraId, const String16& opPackageName, int clientUid)
 {
-    return CameraBaseT::connect(cameraId, clientPackageName, clientUid);
+    return CameraBaseT::connect(cameraId, opPackageName, clientUid);
 }
 
 status_t Camera::connectLegacy(int cameraId, int halVersion,
-        const String16& clientPackageName,
+        const String16& opPackageName,
         int clientUid,
         sp<Camera>& camera)
 {
@@ -89,7 +88,7 @@
     const sp<ICameraService>& cs = CameraBaseT::getCameraService();
 
     if (cs != 0) {
-        status = cs.get()->connectLegacy(cl, cameraId, halVersion, clientPackageName,
+        status = cs.get()->connectLegacy(cl, cameraId, halVersion, opPackageName,
                                         clientUid, /*out*/c->mCamera);
     }
     if (status == OK && c->mCamera != 0) {