Merge "Allow VDM mirror display creation with ACCESS_COMPUTER_CONTROL permission" into main (a6514341) · Commits · e / os / android_frameworks_base

services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java

+17 −6

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.server.companion.virtual;

		import static android.Manifest.permission.ACCESS_COMPUTER_CONTROL;
		import static android.Manifest.permission.ADD_ALWAYS_UNLOCKED_DISPLAY;
		import static android.Manifest.permission.ADD_MIRROR_DISPLAY;
		import static android.Manifest.permission.ADD_TRUSTED_DISPLAY;
		@@ -1256,7 +1257,13 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub

		@Override
		public boolean canCreateMirrorDisplays() {
		if (android.companion.virtualdevice.flags.Flags.enableLimitedVdmRole()
		if (Flags.computerControlAccess()
		&& (mContext.checkCallingOrSelfPermission(ACCESS_COMPUTER_CONTROL)
		== PackageManager.PERMISSION_GRANTED)) {
		return true;
		}

		if (Flags.enableLimitedVdmRole()
		&& CompatChanges.isChangeEnabled(CHECK_ADD_MIRROR_DISPLAY_PERMISSION,
		mOwnerPackageName, UserHandle.getUserHandleForUid(mOwnerUid))) {
		return mContext.checkCallingOrSelfPermission(ADD_MIRROR_DISPLAY)
		@@ -1264,7 +1271,11 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub
		}

		// If the VDM owner app targets B or earlier, we rely on the role instead of the permission.
		return DEVICE_PROFILES_ALLOWING_MIRROR_DISPLAYS.contains(getDeviceProfile());
		String deviceProfile = getDeviceProfile();
		if (deviceProfile == null) {
		return false;
		}
		return DEVICE_PROFILES_ALLOWING_MIRROR_DISPLAYS.contains(deviceProfile);
		}

		private boolean hasCustomAudioInputSupportInternal() {