diff options
Diffstat (limited to 'services/camera/libcameraservice/CameraService.h')
| -rw-r--r-- | services/camera/libcameraservice/CameraService.h | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h index 4cb7fa7..1041550 100644 --- a/services/camera/libcameraservice/CameraService.h +++ b/services/camera/libcameraservice/CameraService.h @@ -38,9 +38,9 @@ #include "CameraFlashlight.h" #include "common/CameraModule.h" +#include "media/RingBuffer.h" #include "utils/AutoConditionLock.h" #include "utils/ClientManager.h" -#include "utils/RingBuffer.h" #include <set> #include <string> @@ -112,19 +112,19 @@ public: virtual status_t getCameraVendorTagDescriptor(/*out*/ sp<VendorTagDescriptor>& desc); virtual status_t connect(const sp<ICameraClient>& cameraClient, int cameraId, - const String16& opPackageName, int clientUid, + const String16& clientPackageName, int clientUid, /*out*/ sp<ICamera>& device); virtual status_t connectLegacy(const sp<ICameraClient>& cameraClient, int cameraId, - int halVersion, const String16& opPackageName, int clientUid, + int halVersion, const String16& clientPackageName, int clientUid, /*out*/ sp<ICamera>& device); virtual status_t connectDevice( const sp<ICameraDeviceCallbacks>& cameraCb, int cameraId, - const String16& opPackageName, + const String16& clientPackageName, int clientUid, /*out*/ sp<ICameraDeviceUser>& device); @@ -209,7 +209,7 @@ public: protected: BasicClient(const sp<CameraService>& cameraService, const sp<IBinder>& remoteCallback, - const String16& opPackageName, + const String16& clientPackageName, int cameraId, int cameraFacing, int clientPid, @@ -228,7 +228,7 @@ public: sp<CameraService> mCameraService; // immutable after constructor int mCameraId; // immutable after constructor int mCameraFacing; // immutable after constructor - const String16 mOpPackageName; + const String16 mClientPackageName; pid_t mClientPid; uid_t mClientUid; // immutable after constructor pid_t mServicePid; // immutable after constructor @@ -295,7 +295,7 @@ public: // Interface used by CameraService Client(const sp<CameraService>& cameraService, const sp<ICameraClient>& cameraClient, - const String16& opPackageName, + const String16& clientPackageName, int cameraId, int cameraFacing, int clientPid, @@ -466,7 +466,7 @@ private: // Single implementation shared between the various connect calls template<class CALLBACK, class CLIENT> status_t connectHelper(const sp<CALLBACK>& cameraCb, const String8& cameraId, int halVersion, - const String16& opPackageName, int clientUid, apiLevel effectiveApiLevel, + const String16& clientPackageName, int clientUid, apiLevel effectiveApiLevel, bool legacyMode, bool shimUpdateOnly, /*out*/sp<CLIENT>& device); @@ -699,8 +699,6 @@ private: int facing, int clientPid, uid_t clientUid, int servicePid, bool legacyMode, int halVersion, int deviceVersion, apiLevel effectiveApiLevel, /*out*/sp<BasicClient>* client); - - status_t checkCameraAccess(const String16& opPackageName); }; template<class Func> @@ -749,11 +747,11 @@ void CameraService::CameraState::updateStatus(ICameraServiceListener::Status sta template<class CALLBACK, class CLIENT> status_t CameraService::connectHelper(const sp<CALLBACK>& cameraCb, const String8& cameraId, - int halVersion, const String16& opPackageName, int clientUid, + int halVersion, const String16& clientPackageName, int clientUid, apiLevel effectiveApiLevel, bool legacyMode, bool shimUpdateOnly, /*out*/sp<CLIENT>& device) { status_t ret = NO_ERROR; - String8 clientName8(opPackageName); + String8 clientName8(clientPackageName); int clientPid = getCallingPid(); ALOGI("CameraService::connect call (PID %d \"%s\", camera ID %s) for HAL version %s and " @@ -824,7 +822,7 @@ status_t CameraService::connectHelper(const sp<CALLBACK>& cameraCb, const String int facing = -1; int deviceVersion = getDeviceVersion(id, /*out*/&facing); sp<BasicClient> tmp = nullptr; - if((ret = makeClient(this, cameraCb, opPackageName, cameraId, facing, clientPid, + if((ret = makeClient(this, cameraCb, clientPackageName, cameraId, facing, clientPid, clientUid, getpid(), legacyMode, halVersion, deviceVersion, effectiveApiLevel, /*out*/&tmp)) != NO_ERROR) { return ret; |