Merge "Camera: Add onCameraOpened/onCameraClosed callbacks" into rvc-dev am: 5ae4551c92 (80fbc4cb) · Commits · e / os / android_frameworks_av

camera/aidl/android/hardware/ICameraServiceListener.aidl

+8 −0

Original line number	Diff line number	Diff line
		@@ -89,4 +89,12 @@ interface ICameraServiceListener
		* can retry after receiving this callback.
		*/
		oneway void onCameraAccessPrioritiesChanged();

		/**
		* Notify registered clients about cameras being opened/closed.
		* Only clients with android.permission.CAMERA_OPEN_CLOSE_LISTENER permission
		* will receive such callbacks.
		*/
		oneway void onCameraOpened(String cameraId, String clientPackageId);
		oneway void onCameraClosed(String cameraId);
		}

camera/ndk/impl/ACameraManager.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -97,6 +97,12 @@ class CameraManagerGlobal final : public RefBase {
		}

		virtual binder::Status onCameraAccessPrioritiesChanged();
		virtual binder::Status onCameraOpened(const String16&, const String16&) {
		return binder::Status::ok();
		}
		virtual binder::Status onCameraClosed(const String16&) {
		return binder::Status::ok();
		}

		private:
		const wp<CameraManagerGlobal> mCameraManager;

camera/tests/CameraBinderTests.cpp

+11 −0

Original line number	Diff line number	Diff line
		@@ -101,6 +101,17 @@ public:
		return binder::Status::ok();
		}

		virtual binder::Status onCameraOpened(const String16& /cameraId/,
		const String16& /clientPackageName/) {
		// No op
		return binder::Status::ok();
		}

		virtual binder::Status onCameraClosed(const String16& /cameraId/) {
		// No op
		return binder::Status::ok();
		}

		bool waitForNumCameras(size_t num) const {
		Mutex::Autolock l(mLock);

services/camera/libcameraservice/CameraService.cpp

+35 −1

Original line number	Diff line number	Diff line
		@@ -126,6 +126,8 @@ static const String16 sCameraPermission("android.permission.CAMERA");
		static const String16 sSystemCameraPermission("android.permission.SYSTEM_CAMERA");
		static const String16
		sCameraSendSystemEventsPermission("android.permission.CAMERA_SEND_SYSTEM_EVENTS");
		static const String16 sCameraOpenCloseListenerPermission(
		"android.permission.CAMERA_OPEN_CLOSE_LISTENER");

		// Matches with PERCEPTIBLE_APP_ADJ in ProcessList.java
		static constexpr int32_t kVendorClientScore = 200;
		@@ -2146,6 +2148,8 @@ Status CameraService::addListenerHelper(const sp<ICameraServiceListener>& listen

		auto clientUid = CameraThreadState::getCallingUid();
		auto clientPid = CameraThreadState::getCallingPid();
		bool openCloseCallbackAllowed = checkPermission(sCameraOpenCloseListenerPermission,
		clientPid, clientUid);

		Mutex::Autolock lock(mServiceLock);

		@@ -2160,7 +2164,8 @@ Status CameraService::addListenerHelper(const sp<ICameraServiceListener>& listen
		}

		sp<ServiceListener> serviceListener =
		new ServiceListener(this, listener, clientUid, clientPid, isVendorListener);
		new ServiceListener(this, listener, clientUid, clientPid, isVendorListener,
		openCloseCallbackAllowed);
		auto ret = serviceListener->initialize();
		if (ret != NO_ERROR) {
		String8 msg = String8::format("Failed to initialize service listener: %s (%d)",
		@@ -2917,6 +2922,9 @@ status_t CameraService::BasicClient::startCameraOps() {

		sCameraService->mUidPolicy->registerMonitorUid(mClientUid);

		// Notify listeners of camera open/close status
		sCameraService->updateOpenCloseStatus(mCameraIdStr, true/open/, mClientPackageName);

		return OK;
		}

		@@ -2957,6 +2965,9 @@ status_t CameraService::BasicClient::finishCameraOps() {

		sCameraService->mUidPolicy->unregisterMonitorUid(mClientUid);

		// Notify listeners of camera open/close status
		sCameraService->updateOpenCloseStatus(mCameraIdStr, false/open/, mClientPackageName);

		return OK;
		}

		@@ -3753,6 +3764,29 @@ void CameraService::updateStatus(StatusInternal status, const String8& cameraId,
		});
		}

		void CameraService::updateOpenCloseStatus(const String8& cameraId, bool open,
		const String16& clientPackageName) {
		Mutex::Autolock lock(mStatusListenerLock);

		for (const auto& it : mListenerList) {
		if (!it->isOpenCloseCallbackAllowed()) {
		continue;
		}

		binder::Status ret;
		String16 cameraId64(cameraId);
		if (open) {
		ret = it->getListener()->onCameraOpened(cameraId64, clientPackageName);
		} else {
		ret = it->getListener()->onCameraClosed(cameraId64);
		}
		if (!ret.isOk()) {
		ALOGE("%s: Failed to trigger onCameraOpened/onCameraClosed callback: %d", __FUNCTION__,
		ret.exceptionCode());
		}
		}
		}

		template<class Func>
		void CameraService::CameraState::updateStatus(StatusInternal status,
		const String8& cameraId,

services/camera/libcameraservice/CameraService.h

+12 −2

Original line number	Diff line number	Diff line
		@@ -913,9 +913,10 @@ private:
		class ServiceListener : public virtual IBinder::DeathRecipient {
		public:
		ServiceListener(sp<CameraService> parent, sp<hardware::ICameraServiceListener> listener,
		int uid, int pid, bool isVendorClient)
		int uid, int pid, bool isVendorClient, bool openCloseCallbackAllowed)
		: mParent(parent), mListener(listener), mListenerUid(uid), mListenerPid(pid),
		mIsVendorListener(isVendorClient) { }
		mIsVendorListener(isVendorClient),
		mOpenCloseCallbackAllowed(openCloseCallbackAllowed) { }

		status_t initialize() {
		return IInterface::asBinder(mListener)->linkToDeath(this);
		@@ -932,6 +933,7 @@ private:
		int getListenerPid() { return mListenerPid; }
		sp<hardware::ICameraServiceListener> getListener() { return mListener; }
		bool isVendorListener() { return mIsVendorListener; }
		bool isOpenCloseCallbackAllowed() { return mOpenCloseCallbackAllowed; }

		private:
		wp<CameraService> mParent;
		@@ -939,6 +941,7 @@ private:
		int mListenerUid = -1;
		int mListenerPid = -1;
		bool mIsVendorListener = false;
		bool mOpenCloseCallbackAllowed = false;
		};

		// Guarded by mStatusListenerMutex
		@@ -961,6 +964,13 @@ private:
		void updateStatus(StatusInternal status,
		const String8& cameraId);

		/**
		* Update the opened/closed status of the given camera id.
		*
		* This method acqiures mStatusListenerLock.
		*/
		void updateOpenCloseStatus(const String8& cameraId, bool open, const String16& packageName);

		// flashlight control
		sp<CameraFlashlight> mFlashlight;
		// guard mTorchStatusMap