Merge "[2/n] Add policy to skip the BlockedAppStreamingActivity" into main (a5ac6b8e) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -3524,6 +3524,7 @@ package android.companion.virtual {
		field @Deprecated public static final int NAVIGATION_POLICY_DEFAULT_BLOCKED = 1; // 0x1
		field @FlaggedApi("android.companion.virtual.flags.dynamic_policy") public static final int POLICY_TYPE_ACTIVITY = 3; // 0x3
		field public static final int POLICY_TYPE_AUDIO = 1; // 0x1
		field @FlaggedApi("android.companion.virtualdevice.flags.activity_control_api") public static final int POLICY_TYPE_BLOCKED_ACTIVITY_BEHAVIOR = 6; // 0x6
		field @FlaggedApi("android.companion.virtual.flags.virtual_camera") public static final int POLICY_TYPE_CAMERA = 5; // 0x5
		field @FlaggedApi("android.companion.virtual.flags.cross_device_clipboard") public static final int POLICY_TYPE_CLIPBOARD = 4; // 0x4
		field public static final int POLICY_TYPE_RECENTS = 2; // 0x2

core/java/android/companion/virtual/VirtualDeviceParams.java

+21 −1

Original line number	Diff line number	Diff line
		@@ -171,7 +171,7 @@ public final class VirtualDeviceParams implements Parcelable {
		* @hide
		*/
		@IntDef(prefix = "POLICY_TYPE_", value = {POLICY_TYPE_RECENTS, POLICY_TYPE_ACTIVITY,
		POLICY_TYPE_CLIPBOARD})
		POLICY_TYPE_CLIPBOARD, POLICY_TYPE_BLOCKED_ACTIVITY_BEHAVIOR})
		@Retention(RetentionPolicy.SOURCE)
		@Target({ElementType.TYPE_PARAMETER, ElementType.TYPE_USE})
		public @interface DynamicPolicyType {}
		@@ -263,6 +263,22 @@ public final class VirtualDeviceParams implements Parcelable {
		@FlaggedApi(Flags.FLAG_VIRTUAL_CAMERA)
		public static final int POLICY_TYPE_CAMERA = 5;

		/**
		* Tells the virtual device framework how to handle activity launches that were blocked due to
		* the current activity policy.
		*
		* <ul>
		* <li>{@link #DEVICE_POLICY_DEFAULT}: Show UI informing the user of the blocked activity
		* launch on the virtual display that the activity was originally launched on.
		* <li>{@link #DEVICE_POLICY_CUSTOM}: Does not inform the user of the blocked activity
		* launch. The virtual device owner can use this policy together with
		* {@link VirtualDeviceManager.ActivityListener#onActivityLaunchBlocked} to provide custom
		* experience on the virtual device.
		* </ul>
		*/
		@FlaggedApi(android.companion.virtualdevice.flags.Flags.FLAG_ACTIVITY_CONTROL_API)
		public static final int POLICY_TYPE_BLOCKED_ACTIVITY_BEHAVIOR = 6;

		private final int mLockState;
		@NonNull private final ArraySet<UserHandle> mUsersWithMatchingAccounts;
		@NavigationPolicy
		@@ -1174,6 +1190,10 @@ public final class VirtualDeviceParams implements Parcelable {
		mDevicePolicies.delete(POLICY_TYPE_CAMERA);
		}

		if (!android.companion.virtualdevice.flags.Flags.activityControlApi()) {
		mDevicePolicies.delete(POLICY_TYPE_BLOCKED_ACTIVITY_BEHAVIOR);
		}

		if ((mAudioPlaybackSessionId != AUDIO_SESSION_ID_GENERATE
		\|\| mAudioRecordingSessionId != AUDIO_SESSION_ID_GENERATE)
		&& mDevicePolicies.get(POLICY_TYPE_AUDIO, DEVICE_POLICY_DEFAULT)

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

+25 −2

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import static android.companion.virtual.VirtualDeviceParams.DEVICE_POLICY_DEFAUL
		import static android.companion.virtual.VirtualDeviceParams.NAVIGATION_POLICY_DEFAULT_ALLOWED;
		import static android.companion.virtual.VirtualDeviceParams.POLICY_TYPE_ACTIVITY;
		import static android.companion.virtual.VirtualDeviceParams.POLICY_TYPE_AUDIO;
		import static android.companion.virtual.VirtualDeviceParams.POLICY_TYPE_BLOCKED_ACTIVITY_BEHAVIOR;
		import static android.companion.virtual.VirtualDeviceParams.POLICY_TYPE_CAMERA;
		import static android.companion.virtual.VirtualDeviceParams.POLICY_TYPE_CLIPBOARD;
		import static android.companion.virtual.VirtualDeviceParams.POLICY_TYPE_RECENTS;
		@@ -720,6 +721,13 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub
		}
		}
		break;
		case POLICY_TYPE_BLOCKED_ACTIVITY_BEHAVIOR:
		if (android.companion.virtualdevice.flags.Flags.activityControlApi()) {
		synchronized (mVirtualDeviceLock) {
		mDevicePolicies.put(policyType, devicePolicy);
		}
		}
		break;
		default:
		throw new IllegalArgumentException("Device policy " + policyType
		+ " cannot be changed at runtime. ");
		@@ -1321,14 +1329,15 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub
		@RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS)
		private void onActivityBlocked(int displayId, ActivityInfo activityInfo) {
		Intent intent = BlockedAppStreamingActivity.createIntent(activityInfo, getDisplayName());
		if (!android.companion.virtualdevice.flags.Flags.activityControlApi()
		\|\| !Objects.equals(activityInfo.getComponentName(), intent.getComponent())) {
		if (shouldShowBlockedActivityDialog(
		activityInfo.getComponentName(), intent.getComponent())) {
		mContext.startActivityAsUser(
		intent.addFlags(
		Intent.FLAG_ACTIVITY_NEW_TASK \| Intent.FLAG_ACTIVITY_CLEAR_TASK),
		ActivityOptions.makeBasic().setLaunchDisplayId(displayId).toBundle(),
		UserHandle.SYSTEM);
		}

		if (android.companion.virtualdevice.flags.Flags.activityControlApi()) {
		mActivityListenerAdapter.onActivityLaunchBlocked(
		displayId,
		@@ -1338,6 +1347,20 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub
		}
		}

		private boolean shouldShowBlockedActivityDialog(ComponentName blockedComponent,
		ComponentName blockedAppStreamingActivityComponent) {
		if (!android.companion.virtualdevice.flags.Flags.activityControlApi()) {
		return true;
		}
		if (Objects.equals(blockedComponent, blockedAppStreamingActivityComponent)) {
		// Do not show the dialog if it was blocked for some reason already to avoid
		// infinite blocking loop.
		return false;
		}
		// Do not show the dialog if disabled by policy.
		return getDevicePolicy(POLICY_TYPE_BLOCKED_ACTIVITY_BEHAVIOR) == DEVICE_POLICY_DEFAULT;
		}

		private void onSecureWindowShown(int displayId, int uid) {
		synchronized (mVirtualDeviceLock) {
		if (!mVirtualDisplays.contains(displayId)) {