Merge "Modify the API for camera privacy allowlist" into main (44e2167e) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/CameraService.cpp

+3 −9

Original line number	Diff line number	Diff line
		@@ -2353,12 +2353,8 @@ bool CameraService::isCameraPrivacyEnabled(const String16& packageName, const st
		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)) {
		} else if (mSensorPrivacyPolicy->getCameraPrivacyState()
		== SensorPrivacyManager::ENABLED_EXCEPT_ALLOWLISTED_APPS) {
		if (hasPermissionsForCameraPrivacyAllowlist(callingPid, callingUid)) {
		return false;
		} else {
		@@ -4903,9 +4899,7 @@ binder::Status CameraService::SensorPrivacyPolicy::onSensorPrivacyStateChanged(
		// 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)) {
		} else if (state == SensorPrivacyManager::ENABLED_EXCEPT_ALLOWLISTED_APPS) {
		service->blockPrivacyEnabledClients();
		}
		return binder::Status::ok();