Merge cherrypicks of [18231932, 18699572] into sc-qpr3-release. (7920f82a) · Commits · e / os / android_frameworks_base

core/java/android/hardware/biometrics/BiometricPrompt.java

+9 −29

Original line number	Diff line number	Diff line
		@@ -420,18 +420,6 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan
		return this;
		}

		/**
		* Set if BiometricPrompt is being used by the legacy fingerprint manager API.
		* @param sensorId sensor id
		* @return This builder.
		* @hide
		*/
		@NonNull
		public Builder setIsForLegacyFingerprintManager(int sensorId) {
		mPromptInfo.setIsForLegacyFingerprintManager(sensorId);
		return this;
		}

		/**
		* Creates a {@link BiometricPrompt}.
		*
		@@ -873,36 +861,28 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan
		@NonNull @CallbackExecutor Executor executor,
		@NonNull AuthenticationCallback callback,
		int userId) {
		if (cancel == null) {
		throw new IllegalArgumentException("Must supply a cancellation signal");
		}
		if (executor == null) {
		throw new IllegalArgumentException("Must supply an executor");
		}
		if (callback == null) {
		throw new IllegalArgumentException("Must supply a callback");
		}

		authenticateInternal(0 /* operationId */, cancel, executor, callback, userId);
		authenticateUserForOperation(cancel, executor, callback, userId, 0 /* operationId */);
		}

		/**
		* Authenticates for the given keystore operation.
		* Authenticates for the given user and keystore operation.
		*
		* @param cancel An object that can be used to cancel authentication
		* @param executor An executor to handle callback events
		* @param callback An object to receive authentication events
		* @param userId The user to authenticate
		* @param operationId The keystore operation associated with authentication
		*
		* @return A requestId that can be used to cancel this operation.
		*
		* @hide
		*/
		@RequiresPermission(USE_BIOMETRIC)
		public long authenticateForOperation(
		@RequiresPermission(USE_BIOMETRIC_INTERNAL)
		public long authenticateUserForOperation(
		@NonNull CancellationSignal cancel,
		@NonNull @CallbackExecutor Executor executor,
		@NonNull AuthenticationCallback callback,
		int userId,
		long operationId) {
		if (cancel == null) {
		throw new IllegalArgumentException("Must supply a cancellation signal");
		@@ -914,7 +894,7 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan
		throw new IllegalArgumentException("Must supply a callback");
		}

		return authenticateInternal(operationId, cancel, executor, callback, mContext.getUserId());
		return authenticateInternal(operationId, cancel, executor, callback, userId);
		}

		/**
		@@ -1048,7 +1028,7 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan
		private void cancelAuthentication(long requestId) {
		if (mService != null) {
		try {
		mService.cancelAuthentication(mToken, mContext.getPackageName(), requestId);
		mService.cancelAuthentication(mToken, mContext.getOpPackageName(), requestId);
		} catch (RemoteException e) {
		Log.e(TAG, "Unable to cancel authentication", e);
		}
		@@ -1107,7 +1087,7 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan
		}

		final long authId = mService.authenticate(mToken, operationId, userId,
		mBiometricServiceReceiver, mContext.getPackageName(), promptInfo);
		mBiometricServiceReceiver, mContext.getOpPackageName(), promptInfo);
		cancel.setOnCancelListener(new OnAuthenticationCancelListener(authId));
		return authId;
		} catch (RemoteException e) {

core/java/android/hardware/biometrics/ITestSessionCallback.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@ package android.hardware.biometrics;
		* ITestSession callback for FingerprintManager and BiometricManager.
		* @hide
		*/
		oneway interface ITestSessionCallback {
		interface ITestSessionCallback {
		void onCleanupStarted(int userId);
		void onCleanupFinished(int userId);
		}

core/java/android/hardware/biometrics/PromptInfo.java

+2 −20

Original line number	Diff line number	Diff line
		@@ -46,7 +46,6 @@ public class PromptInfo implements Parcelable {
		@NonNull private List<Integer> mAllowedSensorIds = new ArrayList<>();
		private boolean mAllowBackgroundAuthentication;
		private boolean mIgnoreEnrollmentState;
		private boolean mIsForLegacyFingerprintManager = false;

		public PromptInfo() {

		@@ -69,7 +68,6 @@ public class PromptInfo implements Parcelable {
		mAllowedSensorIds = in.readArrayList(Integer.class.getClassLoader());
		mAllowBackgroundAuthentication = in.readBoolean();
		mIgnoreEnrollmentState = in.readBoolean();
		mIsForLegacyFingerprintManager = in.readBoolean();
		}

		public static final Creator<PromptInfo> CREATOR = new Creator<PromptInfo>() {
		@@ -107,15 +105,10 @@ public class PromptInfo implements Parcelable {
		dest.writeList(mAllowedSensorIds);
		dest.writeBoolean(mAllowBackgroundAuthentication);
		dest.writeBoolean(mIgnoreEnrollmentState);
		dest.writeBoolean(mIsForLegacyFingerprintManager);
		}

		public boolean containsTestConfigurations() {
		if (mIsForLegacyFingerprintManager
		&& mAllowedSensorIds.size() == 1
		&& !mAllowBackgroundAuthentication) {
		return false;
		} else if (!mAllowedSensorIds.isEmpty()) {
		if (!mAllowedSensorIds.isEmpty()) {
		return true;
		} else if (mAllowBackgroundAuthentication) {
		return true;
		@@ -195,8 +188,7 @@ public class PromptInfo implements Parcelable {
		}

		public void setAllowedSensorIds(@NonNull List<Integer> sensorIds) {
		mAllowedSensorIds.clear();
		mAllowedSensorIds.addAll(sensorIds);
		mAllowedSensorIds = sensorIds;
		}

		public void setAllowBackgroundAuthentication(boolean allow) {
		@@ -207,12 +199,6 @@ public class PromptInfo implements Parcelable {
		mIgnoreEnrollmentState = ignoreEnrollmentState;
		}

		public void setIsForLegacyFingerprintManager(int sensorId) {
		mIsForLegacyFingerprintManager = true;
		mAllowedSensorIds.clear();
		mAllowedSensorIds.add(sensorId);
		}

		// Getters

		public CharSequence getTitle() {
		@@ -286,8 +272,4 @@ public class PromptInfo implements Parcelable {
		public boolean isIgnoreEnrollmentState() {
		return mIgnoreEnrollmentState;
		}

		public boolean isForLegacyFingerprintManager() {
		return mIsForLegacyFingerprintManager;
		}
		}

packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java

+3 −7

Original line number	Diff line number	Diff line
		@@ -134,7 +134,7 @@ public class AuthController extends SystemUI implements CommandQueue.Callbacks,
		private class BiometricTaskStackListener extends TaskStackListener {
		@Override
		public void onTaskStackChanged() {
		mHandler.post(AuthController.this::cancelIfOwnerIsNotInForeground);
		mHandler.post(AuthController.this::handleTaskStackChanged);
		}
		}

		@@ -181,7 +181,7 @@ public class AuthController extends SystemUI implements CommandQueue.Callbacks,
		}
		};

		private void cancelIfOwnerIsNotInForeground() {
		private void handleTaskStackChanged() {
		mExecution.assertIsMainThread();
		if (mCurrentDialog != null) {
		try {
		@@ -193,7 +193,7 @@ public class AuthController extends SystemUI implements CommandQueue.Callbacks,
		final String topPackage = runningTasks.get(0).topActivity.getPackageName();
		if (!topPackage.contentEquals(clientPackage)
		&& !Utils.isSystem(mContext, clientPackage)) {
		Log.e(TAG, "Evicting client due to: " + topPackage);
		Log.w(TAG, "Evicting client due to: " + topPackage);
		mCurrentDialog.dismissWithoutCallback(true /* animate */);
		mCurrentDialog = null;
		mOrientationListener.disable();
		@@ -814,10 +814,6 @@ public class AuthController extends SystemUI implements CommandQueue.Callbacks,
		mCurrentDialog = newDialog;
		mCurrentDialog.show(mWindowManager, savedState);
		mOrientationListener.enable();

		if (!promptInfo.isAllowBackgroundAuthentication()) {
		mHandler.post(this::cancelIfOwnerIsNotInForeground);
		}
		}

		private void onDialogDismissed(@DismissedReason int reason) {

packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthControllerTest.java

+6 −26

Original line number	Diff line number	Diff line
		@@ -554,26 +554,16 @@ public class AuthControllerTest extends SysuiTestCase {
		mAuthController.mLastBiometricPromptInfo.getAuthenticators());
		}

		@Test
		public void testClientNotified_whenTaskStackChangesDuringShow() throws Exception {
		switchTask("other_package");
		showDialog(new int[] {1} /* sensorIds /, false / credentialAllowed */);

		mTestableLooper.processAllMessages();

		assertNull(mAuthController.mCurrentDialog);
		assertNull(mAuthController.mReceiver);
		verify(mDialog1).dismissWithoutCallback(true /* animate */);
		verify(mReceiver).onDialogDismissed(
		eq(BiometricPrompt.DISMISSED_REASON_USER_CANCEL),
		eq(null) /* credentialAttestation */);
		}

		@Test
		public void testClientNotified_whenTaskStackChangesDuringAuthentication() throws Exception {
		showDialog(new int[] {1} /* sensorIds /, false / credentialAllowed */);

		switchTask("other_package");
		List<ActivityManager.RunningTaskInfo> tasks = new ArrayList<>();
		ActivityManager.RunningTaskInfo taskInfo = mock(ActivityManager.RunningTaskInfo.class);
		taskInfo.topActivity = mock(ComponentName.class);
		when(taskInfo.topActivity.getPackageName()).thenReturn("other_package");
		tasks.add(taskInfo);
		when(mActivityTaskManager.getTasks(anyInt())).thenReturn(tasks);

		mAuthController.mTaskStackListener.onTaskStackChanged();
		mTestableLooper.processAllMessages();
		@@ -650,16 +640,6 @@ public class AuthControllerTest extends SysuiTestCase {
		BIOMETRIC_MULTI_SENSOR_FACE_THEN_FINGERPRINT);
		}

		private void switchTask(String packageName) {
		final List<ActivityManager.RunningTaskInfo> tasks = new ArrayList<>();
		final ActivityManager.RunningTaskInfo taskInfo =
		mock(ActivityManager.RunningTaskInfo.class);
		taskInfo.topActivity = mock(ComponentName.class);
		when(taskInfo.topActivity.getPackageName()).thenReturn(packageName);
		tasks.add(taskInfo);
		when(mActivityTaskManager.getTasks(anyInt())).thenReturn(tasks);
		}

		private PromptInfo createTestPromptInfo() {
		PromptInfo promptInfo = new PromptInfo();