Merge changes I02a3c932,I04b6f64d (167aa777) · Commits · e / os / android_frameworks_base

core/java/android/hardware/biometrics/BiometricAuthenticator.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -201,10 +201,21 @@ public interface BiometricAuthenticator {
		throw new UnsupportedOperationException("Stub!");
		}

		/**
		* @return true if the user has enrolled templates for this biometric.
		*/
		default boolean hasEnrolledTemplates(int userId) {
		throw new UnsupportedOperationException("Stub!");
		}

		/**
		* Sets the active user. This is meant to be used to select the current profile
		* to allow separate templates for work profile.
		*/
		default void setActiveUser(int userId) {
		throw new UnsupportedOperationException("Stub!");
		}

		/**
		* This call warms up the hardware and starts scanning for valid biometrics. It terminates
		* when {@link AuthenticationCallback#onAuthenticationError(int,

core/java/android/hardware/biometrics/BiometricManager.java

+18 −0

Original line number	Diff line number	Diff line
		@@ -107,4 +107,22 @@ public class BiometricManager {
		Slog.w(TAG, "registerEnabledOnKeyguardCallback(): Service not connected");
		}
		}

		/**
		* Sets the active user.
		* @hide
		*/
		@RequiresPermission(USE_BIOMETRIC_INTERNAL)
		public void setActiveUser(int userId) {
		if (mService != null) {
		try {
		mService.setActiveUser(userId);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		} else {
		Slog.w(TAG, "setActiveUser(): Service not connected");
		}
		}
		}

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

+18 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package android.hardware.biometrics;

		import static android.Manifest.permission.USE_BIOMETRIC;
		import static android.Manifest.permission.USE_BIOMETRIC_INTERNAL;

		import android.annotation.CallbackExecutor;
		import android.annotation.NonNull;
		@@ -52,6 +53,10 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan
		* @hide
		*/
		public static final String KEY_TITLE = "title";
		/**
		* @hide
		*/
		public static final String KEY_USE_DEFAULT_TITLE = "use_default_title";
		/**
		* @hide
		*/
		@@ -130,6 +135,17 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan
		return this;
		}

		/**
		* For internal use currently. Only takes effect if title is null/empty. Shows a default
		* modality-specific title.
		* @hide
		*/
		@RequiresPermission(USE_BIOMETRIC_INTERNAL)
		public Builder setUseDefaultTitle() {
		mBundle.putBoolean(KEY_USE_DEFAULT_TITLE, true);
		return this;
		}

		/**
		* Optional: Set the subtitle to display.
		* @param subtitle
		@@ -206,8 +222,9 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan
		public BiometricPrompt build() {
		final CharSequence title = mBundle.getCharSequence(KEY_TITLE);
		final CharSequence negative = mBundle.getCharSequence(KEY_NEGATIVE_TEXT);
		final boolean useDefaultTitle = mBundle.getBoolean(KEY_USE_DEFAULT_TITLE);

		if (TextUtils.isEmpty(title)) {
		if (TextUtils.isEmpty(title) && !useDefaultTitle) {
		throw new IllegalArgumentException("Title must be set and non-empty");
		} else if (TextUtils.isEmpty(negative)) {
		throw new IllegalArgumentException("Negative text must be set and non-empty");

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -43,4 +43,7 @@ interface IBiometricService {

		// Register callback for when keyguard biometric eligibility changes.
		void registerEnabledOnKeyguardCallback(IBiometricEnabledOnKeyguardCallback callback);

		// Explicitly set the active user.
		void setActiveUser(int userId);
		}

core/java/android/hardware/face/FaceManager.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -317,6 +317,7 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan
		* @hide
		*/
		@RequiresPermission(MANAGE_BIOMETRIC)
		@Override
		public void setActiveUser(int userId) {
		if (mService != null) {
		try {