Merge "Fix the test failure in GtsPermissionUiTestCases" into main (32477236) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/appop/AppOpsService.java

+8 −3

Original line number	Original line	Diff line number	Diff line
	@@ -4727,10 +4727,15 @@ public class AppOpsService extends IAppOpsService.Stub {
	}		}

	if ((code == OP_CAMERA) && isAutomotive()) {		if ((code == OP_CAMERA) && isAutomotive()) {
			final long identity = Binder.clearCallingIdentity();
			try {
	if ((Flags.cameraPrivacyAllowlist())		if ((Flags.cameraPrivacyAllowlist())
	&& (mSensorPrivacyManager.isCameraPrivacyEnabled(packageName))) {		&& (mSensorPrivacyManager.isCameraPrivacyEnabled(packageName))) {
	return true;		return true;
	}		}
			} finally {
			Binder.restoreCallingIdentity(identity);
			}
	}		}

	int userHandle = UserHandle.getUserId(uid);		int userHandle = UserHandle.getUserId(uid);