Merge "Revert "Implement camera privacy allowlist."" into main (a9bb332f) · Commits · e / os / android_frameworks_av

camera/camera_platform.aconfig

+0 −7

Original line number	Diff line number	Diff line
		@@ -104,10 +104,3 @@ flag {
		description: "Enable returning graphics buffers to buffer queues without holding the in-flight mutex"
		bug: "315526878"
		}

		flag {
		namespace: "camera_platform"
		name: "privacy_allowlist"
		description: "Allowlisting to exempt safety-relevant cameras from privacy control for automotive devices"
		bug: "282814430"
		}

services/audiopolicy/service/AudioPolicyService.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -542,10 +542,6 @@ private:
		binder::Status onSensorPrivacyChanged(int toggleType, int sensor,
		bool enabled);

		binder::Status onSensorPrivacyStateChanged(int, int, int) {
		return binder::Status::ok();
		}

		private:
		wp<AudioPolicyService> mService;
		std::atomic_bool mSensorPrivacyEnabled = false;

services/camera/libcameraservice/CameraService.cpp

+42 −172

Original line number	Diff line number	Diff line
		@@ -135,8 +135,6 @@ static const std::string sCameraPermission("android.permission.CAMERA");
		static const std::string sSystemCameraPermission("android.permission.SYSTEM_CAMERA");
		static const std::string sCameraHeadlessSystemUserPermission(
		"android.permission.CAMERA_HEADLESS_SYSTEM_USER");
		static const std::string sCameraPrivacyAllowlistPermission(
		"android.permission.CAMERA_PRIVACY_ALLOWLIST");
		static const std::string
		sCameraSendSystemEventsPermission("android.permission.CAMERA_SEND_SYSTEM_EVENTS");
		static const std::string sCameraOpenCloseListenerPermission(
		@@ -822,14 +820,6 @@ bool CameraService::hasPermissionsForCameraHeadlessSystemUser(const std::string&
		std::string(), AppOpsManager::OP_NONE);
		}

		bool CameraService::hasPermissionsForCameraPrivacyAllowlist(int callingPid, int callingUid) const{
		AttributionSourceState attributionSource{};
		attributionSource.pid = callingPid;
		attributionSource.uid = callingUid;
		return checkPermission(std::string(), sCameraPrivacyAllowlistPermission, attributionSource,
		std::string(), AppOpsManager::OP_NONE);
		}

		Status CameraService::getNumberOfCameras(int32_t type, int32_t* numCameras) {
		ATRACE_CALL();
		Mutex::Autolock l(mServiceLock);
		@@ -2355,39 +2345,6 @@ Status CameraService::connectDevice(
		return ret;
		}

		bool CameraService::isCameraPrivacyEnabled(const String16& packageName, const std::string& cam_id,
		int callingPid, int callingUid) {
		if (!isAutomotiveDevice()) {
		return mSensorPrivacyPolicy->isCameraPrivacyEnabled();
		}

		// Automotive privileged client AID_AUTOMOTIVE_EVS using exterior system camera for
		// safety-critical use cases cannot be disabled and are exempt from camera privacy policy.
		if ((isAutomotivePrivilegedClient(callingUid) && isAutomotiveExteriorSystemCamera(cam_id))) {
		ALOGI("Camera privacy cannot be enabled for automotive privileged client %d "
		"using camera %s", callingUid, cam_id.c_str());
		return false;
		}

		if (mSensorPrivacyPolicy->isCameraPrivacyEnabled(packageName)) {
		return true;
		} else if (mSensorPrivacyPolicy->getCameraPrivacyState() == SensorPrivacyManager::DISABLED) {
		return false;
		} else if ((mSensorPrivacyPolicy->getCameraPrivacyState()
		== SensorPrivacyManager::AUTOMOTIVE_DRIVER_ASSISTANCE_HELPFUL_APPS) \|\|
		(mSensorPrivacyPolicy->getCameraPrivacyState()
		== SensorPrivacyManager::AUTOMOTIVE_DRIVER_ASSISTANCE_REQUIRED_APPS) \|\|
		(mSensorPrivacyPolicy->getCameraPrivacyState() ==
		SensorPrivacyManager::AUTOMOTIVE_DRIVER_ASSISTANCE_APPS)) {
		if (hasPermissionsForCameraPrivacyAllowlist(callingPid, callingUid)) {
		return false;
		} else {
		return true;
		}
		}
		return false;
		}

		std::string CameraService::getPackageNameFromUid(int clientUid) {
		std::string packageName("");

		@@ -2660,16 +2617,14 @@ Status CameraService::connectHelper(const sp<CALLBACK>& cameraCb, const std::str
		}
		}

		bool isCameraPrivacyEnabled;
		if (flags::privacy_allowlist()) {
		// Automotive privileged client AID_AUTOMOTIVE_EVS using exterior system camera for use
		// cases such as rear view and surround view cannot be disabled and are exempt from camera
		// privacy policy.
		if ((!isAutomotivePrivilegedClient(packageUid) \|\|
		!isAutomotiveExteriorSystemCamera(cameraId))) {
		// Set camera muting behavior.
		isCameraPrivacyEnabled = this->isCameraPrivacyEnabled(
		toString16(client->getPackageName()), cameraId, packagePid, packageUid);
		} else {
		isCameraPrivacyEnabled =
		bool isCameraPrivacyEnabled =
		mSensorPrivacyPolicy->isCameraPrivacyEnabled();
		}

		if (client->supportsCameraMute()) {
		client->setCameraMute(
		mOverrideCameraMuteMode \|\| isCameraPrivacyEnabled);
		@@ -2694,6 +2649,7 @@ Status CameraService::connectHelper(const sp<CALLBACK>& cameraCb, const std::str
		return STATUS_ERROR_FMT(ERROR_DISABLED,
		"Camera \"%s\" disabled due to camera mute", cameraId.c_str());
		}
		}

		if (shimUpdateOnly) {
		// If only updating legacy shim parameters, immediately disconnect client
		@@ -4213,15 +4169,8 @@ status_t CameraService::BasicClient::handleAppOpMode(int32_t mode) {
		// return MODE_IGNORED. Do not treat such case as error.
		bool isUidActive = sCameraService->mUidPolicy->isUidActive(mClientUid,
		mClientPackageName);

		bool isCameraPrivacyEnabled;
		if (flags::privacy_allowlist()) {
		isCameraPrivacyEnabled = sCameraService->isCameraPrivacyEnabled(
		toString16(mClientPackageName), std::string(), mClientPid, mClientUid);
		} else {
		isCameraPrivacyEnabled =
		bool isCameraPrivacyEnabled =
		sCameraService->mSensorPrivacyPolicy->isCameraPrivacyEnabled();
		}
		// We don't want to return EACCESS if the CameraPrivacy is enabled.
		// We prefer to successfully open the camera and perform camera muting
		// or blocking in connectHelper as handleAppOpMode can be called before the
		@@ -4408,19 +4357,11 @@ void CameraService::BasicClient::opChanged(int32_t op, const String16&) {
		block();
		} else if (res == AppOpsManager::MODE_IGNORED) {
		bool isUidActive = sCameraService->mUidPolicy->isUidActive(mClientUid, mClientPackageName);

		bool isCameraPrivacyEnabled;
		if (flags::privacy_allowlist()) {
		isCameraPrivacyEnabled = sCameraService->isCameraPrivacyEnabled(
		toString16(mClientPackageName),std::string(),mClientPid,mClientUid);
		} else {
		isCameraPrivacyEnabled =
		bool isCameraPrivacyEnabled =
		sCameraService->mSensorPrivacyPolicy->isCameraPrivacyEnabled();
		}

		ALOGI("Camera %s: Access for \"%s\" has been restricted, isUidTrusted %d, isUidActive %d"
		" isCameraPrivacyEnabled %d", mCameraIdStr.c_str(), mClientPackageName.c_str(),
		mUidIsTrusted, isUidActive, isCameraPrivacyEnabled);
		ALOGI("Camera %s: Access for \"%s\" has been restricted, isUidTrusted %d, isUidActive %d",
		mCameraIdStr.c_str(), mClientPackageName.c_str(),
		mUidIsTrusted, isUidActive);
		// If the calling Uid is trusted (a native service), or the client Uid is active (WAR for
		// b/175320666), the AppOpsManager could return MODE_IGNORED. Do not treat such cases as
		// error.
		@@ -4800,15 +4741,7 @@ void CameraService::SensorPrivacyPolicy::registerWithSensorPrivacyManager()
		}
		hasCameraPrivacyFeature(); // Called so the result is cached
		mSpm.addSensorPrivacyListener(this);
		if (isAutomotiveDevice()) {
		mSpm.addToggleSensorPrivacyListener(this);
		}
		mSensorPrivacyEnabled = mSpm.isSensorPrivacyEnabled();
		if (flags::privacy_allowlist()) {
		mCameraPrivacyState = mSpm.getToggleSensorPrivacyState(
		SensorPrivacyManager::TOGGLE_TYPE_SOFTWARE,
		SensorPrivacyManager::TOGGLE_SENSOR_CAMERA);
		}
		status_t res = mSpm.linkToDeath(this);
		if (res == OK) {
		mRegistered = true;
		@@ -4840,9 +4773,6 @@ void CameraService::SensorPrivacyPolicy::registerSelf() {
		void CameraService::SensorPrivacyPolicy::unregisterSelf() {
		Mutex::Autolock _l(mSensorPrivacyLock);
		mSpm.removeSensorPrivacyListener(this);
		if (isAutomotiveDevice()) {
		mSpm.removeToggleSensorPrivacyListener(this);
		}
		mSpm.unlinkToDeath(this);
		mRegistered = false;
		ALOGV("SensorPrivacyPolicy: Unregistered with SensorPrivacyManager");
		@@ -4857,15 +4787,6 @@ bool CameraService::SensorPrivacyPolicy::isSensorPrivacyEnabled() {
		return mSensorPrivacyEnabled;
		}

		int CameraService::SensorPrivacyPolicy::getCameraPrivacyState() {
		if (!mRegistered) {
		registerWithSensorPrivacyManager();
		}

		Mutex::Autolock _l(mSensorPrivacyLock);
		return mCameraPrivacyState;
		}

		bool CameraService::SensorPrivacyPolicy::isCameraPrivacyEnabled() {
		if (!hasCameraPrivacyFeature()) {
		return false;
		@@ -4873,17 +4794,8 @@ bool CameraService::SensorPrivacyPolicy::isCameraPrivacyEnabled() {
		return mSpm.isToggleSensorPrivacyEnabled(SensorPrivacyManager::TOGGLE_SENSOR_CAMERA);
		}

		bool CameraService::SensorPrivacyPolicy::isCameraPrivacyEnabled(const String16& packageName) {
		if (!hasCameraPrivacyFeature()) {
		return SensorPrivacyManager::DISABLED;
		}
		return mSpm.isCameraPrivacyEnabled(packageName);
		}

		binder::Status CameraService::SensorPrivacyPolicy::onSensorPrivacyChanged(
		int toggleType, int sensor, bool enabled) {
		if ((toggleType == SensorPrivacyManager::TOGGLE_TYPE_UNKNOWN)
		&& (sensor == SensorPrivacyManager::TOGGLE_SENSOR_UNKNOWN)) {
		int toggleType __unused, int sensor __unused, bool enabled) {
		{
		Mutex::Autolock _l(mSensorPrivacyLock);
		mSensorPrivacyEnabled = enabled;
		@@ -4895,31 +4807,6 @@ binder::Status CameraService::SensorPrivacyPolicy::onSensorPrivacyChanged(
		service->blockAllClients();
		}
		}
		}
		return binder::Status::ok();
		}

		binder::Status CameraService::SensorPrivacyPolicy::onSensorPrivacyStateChanged(
		int, int sensor, int state) {
		if (!flags::privacy_allowlist() \|\| (sensor != SensorPrivacyManager::TOGGLE_SENSOR_CAMERA)) {
		return binder::Status::ok();
		}
		{
		Mutex::Autolock _l(mSensorPrivacyLock);
		mCameraPrivacyState = state;
		}
		sp<CameraService> service = mService.promote();
		if (!service) {
		return binder::Status::ok();
		}
		// if sensor privacy is enabled then block all clients from accessing the camera
		if (state == SensorPrivacyManager::ENABLED) {
		service->blockAllClients();
		} else if ((state == SensorPrivacyManager::AUTOMOTIVE_DRIVER_ASSISTANCE_APPS)
		\|\| (state == SensorPrivacyManager::AUTOMOTIVE_DRIVER_ASSISTANCE_HELPFUL_APPS)
		\|\| (state == SensorPrivacyManager::AUTOMOTIVE_DRIVER_ASSISTANCE_REQUIRED_APPS)) {
		service->blockPrivacyEnabledClients();
		}
		return binder::Status::ok();
		}

		@@ -5790,23 +5677,6 @@ void CameraService::blockAllClients() {
		}
		}

		void CameraService::blockPrivacyEnabledClients() {
		const auto clients = mActiveClientManager.getAll();
		for (auto& current : clients) {
		if (current != nullptr) {
		const auto basicClient = current->getValue();
		if (basicClient.get() != nullptr) {
		std::string pkgName = basicClient->getPackageName();
		bool cameraPrivacyEnabled =
		mSensorPrivacyPolicy->isCameraPrivacyEnabled(toString16(pkgName));
		if (cameraPrivacyEnabled) {
		basicClient->block();
		}
		}
		}
		}
		}

		// NOTE: This is a remote API - make sure all args are validated
		status_t CameraService::shellCommand(int in, int out, int err, const Vector<String16>& args) {
		if (!checkCallingPermission(toString16(sManageCameraPermission), nullptr, nullptr)) {

services/camera/libcameraservice/CameraService.h

+1 −15

Original line number	Diff line number	Diff line
		@@ -681,9 +681,6 @@ private:
		int callingUid) const;

		bool hasCameraPermissions() const;

		bool hasPermissionsForCameraPrivacyAllowlist(int callingPid, int callingUid) const;

		/**
		* Typesafe version of device status, containing both the HAL-layer and the service interface-
		* layer values.
		@@ -871,20 +868,16 @@ private:
		public virtual IServiceManager::LocalRegistrationCallback {
		public:
		explicit SensorPrivacyPolicy(wp<CameraService> service)
		: mService(service), mSensorPrivacyEnabled(false),
		mCameraPrivacyState(SensorPrivacyManager::DISABLED), mRegistered(false) {}
		: mService(service), mSensorPrivacyEnabled(false), mRegistered(false) {}

		void registerSelf();
		void unregisterSelf();

		bool isSensorPrivacyEnabled();
		bool isCameraPrivacyEnabled();
		int getCameraPrivacyState();
		bool isCameraPrivacyEnabled(const String16& packageName);

		binder::Status onSensorPrivacyChanged(int toggleType, int sensor,
		bool enabled);
		binder::Status onSensorPrivacyStateChanged(int toggleType, int sensor, int state);

		// Implementation of IServiceManager::LocalRegistrationCallback
		virtual void onServiceRegistration(const String16& name,
		@@ -897,7 +890,6 @@ private:
		wp<CameraService> mService;
		Mutex mSensorPrivacyLock;
		bool mSensorPrivacyEnabled;
		int mCameraPrivacyState;
		bool mRegistered;

		bool hasCameraPrivacyFeature();
		@@ -934,9 +926,6 @@ private:
		const std::string& clientName, /inout/int& clientUid, /inout/int& clientPid,
		/out/int& originalClientPid) const;

		bool isCameraPrivacyEnabled(const String16& packageName,const std::string& cameraId,
		int clientPid, int ClientUid);

		// Handle active client evictions, and update service state.
		// Only call with with mServiceLock held.
		status_t handleEvictionsLocked(const std::string& cameraId, int clientPid,
		@@ -1396,9 +1385,6 @@ private:
		// Blocks all active clients.
		void blockAllClients();

		// Blocks clients whose privacy is enabled.
		void blockPrivacyEnabledClients();

		// Overrides the UID state as if it is idle
		status_t handleSetUidState(const Vector<String16>& args, int err);