Merge "Warn the user when a streamed app requests authentication" into udc-dev (4ebdfbb3) · Commits · e / os / android_frameworks_base

core/res/res/values/strings.xml

+3 −3

Original line number	Diff line number	Diff line
		@@ -5392,11 +5392,11 @@
		<string name="app_streaming_blocked_message" product="tablet">This can’t be accessed on your <xliff:g id="device" example="Chromebook">%1$s</xliff:g> at this time. Try on your tablet instead.</string>
		<!-- Message shown when an app is blocked from being streamed to a remote device. [CHAR LIMIT=NONE] -->
		<string name="app_streaming_blocked_message" product="default">This can’t be accessed on your <xliff:g id="device" example="Chromebook">%1$s</xliff:g> at this time. Try on your phone instead.</string>
		<!-- Message shown when the fingerprint permission is blocked from being streamed to a remote device. [CHAR LIMIT=NONE] -->
		<!-- Message shown when an app being streamed to another device requests authentication such as via the biometrics API, and the user needs to complete the on their device. [CHAR LIMIT=NONE] -->
		<string name="app_streaming_blocked_message_for_fingerprint_dialog" product="tv">This app is requesting additional security. Try on your Android TV device instead.</string>
		<!-- Message shown when the fingerprint permission is blocked from being streamed to a remote device. [CHAR LIMIT=NONE] -->
		<!-- Message shown when an app being streamed to another device requests authentication such as via the biometrics API, and the user needs to complete the on their device. [CHAR LIMIT=NONE] -->
		<string name="app_streaming_blocked_message_for_fingerprint_dialog" product="tablet">This app is requesting additional security. Try on your tablet instead.</string>
		<!-- Message shown when the fingerprint permission is blocked from being streamed to a remote device. [CHAR LIMIT=NONE] -->
		<!-- Message shown when an app being streamed to another device requests authentication such as via the biometrics API, and the user needs to complete the on their device. [CHAR LIMIT=NONE] -->
		<string name="app_streaming_blocked_message_for_fingerprint_dialog" product="default">This app is requesting additional security. Try on your phone instead.</string>
		<!-- Message shown when the settings is blocked from being streamed to a remote device. [CHAR LIMIT=NONE] -->
		<string name="app_streaming_blocked_message_for_settings_dialog" product="tv">This can’t be accessed on your <xliff:g id="device" example="Chromebook">%1$s</xliff:g>. Try on your Android TV device instead.</string>

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

+14 −1

Original line number	Diff line number	Diff line
		@@ -55,6 +55,7 @@ import android.util.SparseArray;
		import android.view.Display;
		import android.widget.Toast;

		import com.android.internal.R;
		import com.android.internal.annotations.GuardedBy;
		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.util.DumpUtils;
		@@ -156,7 +157,7 @@ public class VirtualDeviceManagerService extends SystemService {
		VirtualDeviceImpl virtualDevice = virtualDevicesSnapshot.get(i);
		virtualDevice.showToastWhereUidIsRunning(appUid,
		getContext().getString(
		com.android.internal.R.string.vdm_camera_access_denied,
		R.string.vdm_camera_access_denied,
		virtualDevice.getDisplayName()),
		Toast.LENGTH_LONG, Looper.myLooper());
		}
		@@ -622,6 +623,18 @@ public class VirtualDeviceManagerService extends SystemService {
		}
		}

		@Override
		public void onAuthenticationPrompt(int uid) {
		synchronized (mVirtualDeviceManagerLock) {
		for (int i = 0; i < mVirtualDevices.size(); i++) {
		VirtualDeviceImpl device = mVirtualDevices.valueAt(i);
		device.showToastWhereUidIsRunning(uid,
		R.string.app_streaming_blocked_message_for_fingerprint_dialog,
		Toast.LENGTH_LONG, Looper.getMainLooper());
		}
		}
		}

		@Override
		public int getBaseVirtualDisplayFlags(IVirtualDevice virtualDevice) {
		return ((VirtualDeviceImpl) virtualDevice).getBaseVirtualDisplayFlags();

services/core/java/com/android/server/biometrics/AuthService.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -70,6 +70,7 @@ import com.android.internal.R;
		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.util.ArrayUtils;
		import com.android.server.SystemService;
		import com.android.server.companion.virtual.VirtualDeviceManagerInternal;

		import java.util.ArrayList;
		import java.util.Arrays;
		@@ -262,6 +263,11 @@ public class AuthService extends SystemService {

		final long identity = Binder.clearCallingIdentity();
		try {
		VirtualDeviceManagerInternal vdm = getLocalService(
		VirtualDeviceManagerInternal.class);
		if (vdm != null) {
		vdm.onAuthenticationPrompt(callingUid);
		}
		return mBiometricService.authenticate(
		token, sessionId, userId, receiver, opPackageName, promptInfo);
		} finally {

services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -91,6 +91,7 @@ import com.android.server.biometrics.sensors.LockoutTracker;
		import com.android.server.biometrics.sensors.fingerprint.aidl.FingerprintProvider;
		import com.android.server.biometrics.sensors.fingerprint.hidl.Fingerprint21;
		import com.android.server.biometrics.sensors.fingerprint.hidl.Fingerprint21UdfpsMock;
		import com.android.server.companion.virtual.VirtualDeviceManagerInternal;

		import com.google.android.collect.Lists;

		@@ -329,6 +330,16 @@ public class FingerprintService extends SystemService {
		return -1;
		}
		}
		final long identity2 = Binder.clearCallingIdentity();
		try {
		VirtualDeviceManagerInternal vdm = getLocalService(
		VirtualDeviceManagerInternal.class);
		if (vdm != null) {
		vdm.onAuthenticationPrompt(callingUid);
		}
		} finally {
		Binder.restoreCallingIdentity(identity2);
		}
		return provider.second.scheduleAuthenticate(token, operationId,
		0 /* cookie */, new ClientMonitorCallbackConverter(receiver), options,
		restricted, statsClient, isKeyguard);

services/core/java/com/android/server/companion/virtual/VirtualDeviceManagerInternal.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -69,6 +69,11 @@ public abstract class VirtualDeviceManagerInternal {
		*/
		public abstract void onAppsOnVirtualDeviceChanged();

		/**
		* Notifies that an authentication prompt is about to be shown for an app with the given uid.
		*/
		public abstract void onAuthenticationPrompt(int uid);

		/**
		* Gets the owner uid for a deviceId.
		*