Merge "Show warning toast for secure window" into tm-qpr-dev (073eeabf) · Commits · e / os / android_frameworks_base

core/res/res/values/strings.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -6323,6 +6323,8 @@ ul.</string>
		<string name="vdm_camera_access_denied" product="default">Can’t access the phone’s camera from your <xliff:g id="device" example="Chromebook">%1$s</xliff:g></string>
		<!-- Error message indicating the camera cannot be accessed when running on a virtual device. [CHAR LIMIT=NONE] -->
		<string name="vdm_camera_access_denied" product="tablet">Can’t access the tablet’s camera from your <xliff:g id="device" example="Chromebook">%1$s</xliff:g></string>
		<!-- Error message indicating the user cannot access secure content when running on a virtual device. [CHAR LIMIT=NONE] -->
		<string name="vdm_secure_window">This can’t be accessed while streaming. Try on your phone instead.</string>

		<!-- Title for preference of the system default locale. [CHAR LIMIT=50]-->
		<string name="system_locale_title">System default</string>

core/res/res/values/symbols.xml

+1 −0

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

		<!-- For VirtualDeviceManager -->
		<java-symbol type="string" name="vdm_camera_access_denied" />
		<java-symbol type="string" name="vdm_secure_window" />

		<java-symbol type="color" name="camera_privacy_light_day"/>
		<java-symbol type="color" name="camera_privacy_light_night"/>

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

+19 −0

Original line number	Diff line number	Diff line
		@@ -76,6 +76,14 @@ public class GenericWindowPolicyController extends DisplayWindowPolicyController
		private static final ComponentName BLOCKED_APP_STREAMING_COMPONENT =
		new ComponentName("android", BlockedAppStreamingActivity.class.getName());

		/**
		* For communicating when a secure window shows on the virtual display.
		*/
		public interface SecureWindowCallback {
		/** Called when a secure window shows on the virtual display. */
		void onSecureWindowShown(int displayId, int uid);
		}

		/**
		* If required, allow the secure activity to display on remote device since
		* {@link android.os.Build.VERSION_CODES#TIRAMISU}.
		@@ -108,6 +116,7 @@ public class GenericWindowPolicyController extends DisplayWindowPolicyController
		new ArraySet<>();
		@Nullable
		private final @AssociationRequest.DeviceProfile String mDeviceProfile;
		@Nullable private final SecureWindowCallback mSecureWindowCallback;

		/**
		* Creates a window policy controller that is generic to the different use cases of virtual
		@@ -131,6 +140,8 @@ public class GenericWindowPolicyController extends DisplayWindowPolicyController
		* @param activityListener Activity listener to listen for activity changes.
		* @param activityBlockedCallback Callback that is called when an activity is blocked from
		* launching.
		* @param secureWindowCallback Callback that is called when a secure window shows on the
		* virtual display.
		* @param deviceProfile The {@link AssociationRequest.DeviceProfile} of this virtual device.
		*/
		public GenericWindowPolicyController(int windowFlags, int systemWindowFlags,
		@@ -142,6 +153,7 @@ public class GenericWindowPolicyController extends DisplayWindowPolicyController
		@ActivityPolicy int defaultActivityPolicy,
		@NonNull ActivityListener activityListener,
		@NonNull ActivityBlockedCallback activityBlockedCallback,
		@NonNull SecureWindowCallback secureWindowCallback,
		@AssociationRequest.DeviceProfile String deviceProfile) {
		super();
		mAllowedUsers = allowedUsers;
		@@ -154,6 +166,7 @@ public class GenericWindowPolicyController extends DisplayWindowPolicyController
		setInterestedWindowFlags(windowFlags, systemWindowFlags);
		mActivityListener = activityListener;
		mDeviceProfile = deviceProfile;
		mSecureWindowCallback = secureWindowCallback;
		}

		/**
		@@ -234,6 +247,12 @@ public class GenericWindowPolicyController extends DisplayWindowPolicyController
		@Override
		public boolean keepActivityOnWindowFlagsChanged(ActivityInfo activityInfo, int windowFlags,
		int systemWindowFlags) {
		// The callback is fired only when windowFlags are changed. To let VirtualDevice owner
		// aware that the virtual display has a secure window on top.
		if ((windowFlags & FLAG_SECURE) != 0) {
		mSecureWindowCallback.onSecureWindowShown(mDisplayId, activityInfo.applicationInfo.uid);
		}

		if (!canContainActivity(activityInfo, windowFlags, systemWindowFlags)) {
		mActivityBlockedCallback.onActivityBlocked(mDisplayId, activityInfo);
		return false;

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

+23 −4

Original line number	Diff line number	Diff line
		@@ -52,6 +52,7 @@ import android.hardware.input.VirtualMouseScrollEvent;
		import android.hardware.input.VirtualTouchEvent;
		import android.os.Binder;
		import android.os.IBinder;
		import android.os.Looper;
		import android.os.PowerManager;
		import android.os.RemoteException;
		import android.os.ResultReceiver;
		@@ -542,6 +543,7 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub
		mParams.getDefaultActivityPolicy(),
		createListenerAdapter(),
		this::onActivityBlocked,
		this::onSecureWindowShown,
		mAssociationInfo.getDeviceProfile());
		gwpc.registerRunningAppsChangedListener(/* listener= */ this);
		return gwpc;
		@@ -591,6 +593,21 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub
		mContext.getUser());
		}

		private void onSecureWindowShown(int displayId, int uid) {
		if (!mVirtualDisplayIds.contains(displayId)) {
		return;
		}

		// If a virtual display isn't secure, the screen can't be captured. Show a warning toast
		// if the secure window is shown on a non-secure virtual display.
		DisplayManager displayManager = mContext.getSystemService(DisplayManager.class);
		Display display = displayManager.getDisplay(displayId);
		if ((display.getFlags() & FLAG_SECURE) == 0) {
		showToastWhereUidIsRunning(uid, com.android.internal.R.string.vdm_secure_window,
		Toast.LENGTH_LONG, mContext.getMainLooper());
		}
		}

		private ArraySet<UserHandle> getAllowedUserHandles() {
		ArraySet<UserHandle> result = new ArraySet<>();
		DevicePolicyManager dpm = mContext.getSystemService(DevicePolicyManager.class);
		@@ -650,14 +667,16 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub
		/**
		* Shows a toast on virtual displays owned by this device which have a given uid running.
		*/
		void showToastWhereUidIsRunning(int uid, @StringRes int resId, @Toast.Duration int duration) {
		showToastWhereUidIsRunning(uid, mContext.getString(resId), duration);
		void showToastWhereUidIsRunning(int uid, @StringRes int resId, @Toast.Duration int duration,
		Looper looper) {
		showToastWhereUidIsRunning(uid, mContext.getString(resId), duration, looper);
		}

		/**
		* Shows a toast on virtual displays owned by this device which have a given uid running.
		*/
		void showToastWhereUidIsRunning(int uid, String text, @Toast.Duration int duration) {
		void showToastWhereUidIsRunning(int uid, String text, @Toast.Duration int duration,
		Looper looper) {
		synchronized (mVirtualDeviceLock) {
		DisplayManager displayManager = mContext.getSystemService(DisplayManager.class);
		final int size = mWindowPolicyControllers.size();
		@@ -666,7 +685,7 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub
		int displayId = mWindowPolicyControllers.keyAt(i);
		Display display = displayManager.getDisplay(displayId);
		if (display != null && display.isValid()) {
		Toast.makeText(mContext.createDisplayContext(display), text,
		Toast.makeText(mContext.createDisplayContext(display), looper, text,
		duration).show();
		}
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -202,7 +202,7 @@ public class VirtualDeviceManagerService extends SystemService {
		getContext().getString(
		com.android.internal.R.string.vdm_camera_access_denied,
		deviceName),
		Toast.LENGTH_LONG);
		Toast.LENGTH_LONG, Looper.myLooper());
		}
		}
		}