Merge "Remove custom_biometric_prompt flag" into main (c0390ae1) · Commits · e / os / android_frameworks_base

core/api/current.txt

+15 −15

Original line number	Diff line number	Diff line
		@@ -294,7 +294,7 @@ package android {
		field public static final String SET_ALARM = "com.android.alarm.permission.SET_ALARM";
		field public static final String SET_ALWAYS_FINISH = "android.permission.SET_ALWAYS_FINISH";
		field public static final String SET_ANIMATION_SCALE = "android.permission.SET_ANIMATION_SCALE";
		field @FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") public static final String SET_BIOMETRIC_DIALOG_ADVANCED = "android.permission.SET_BIOMETRIC_DIALOG_ADVANCED";
		field public static final String SET_BIOMETRIC_DIALOG_ADVANCED = "android.permission.SET_BIOMETRIC_DIALOG_ADVANCED";
		field public static final String SET_DEBUG_APP = "android.permission.SET_DEBUG_APP";
		field @Deprecated public static final String SET_PREFERRED_APPLICATIONS = "android.permission.SET_PREFERRED_APPLICATIONS";
		field public static final String SET_PROCESS_LIMIT = "android.permission.SET_PROCESS_LIMIT";
		@@ -19103,11 +19103,11 @@ package android.hardware.biometrics {
		method @RequiresPermission(android.Manifest.permission.USE_BIOMETRIC) public void authenticate(@NonNull android.hardware.biometrics.BiometricPrompt.CryptoObject, @NonNull android.os.CancellationSignal, @NonNull java.util.concurrent.Executor, @NonNull android.hardware.biometrics.BiometricPrompt.AuthenticationCallback);
		method @RequiresPermission(android.Manifest.permission.USE_BIOMETRIC) public void authenticate(@NonNull android.os.CancellationSignal, @NonNull java.util.concurrent.Executor, @NonNull android.hardware.biometrics.BiometricPrompt.AuthenticationCallback);
		method @Nullable public int getAllowedAuthenticators();
		method @FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") @Nullable public android.hardware.biometrics.PromptContentView getContentView();
		method @Nullable public android.hardware.biometrics.PromptContentView getContentView();
		method @Nullable public CharSequence getDescription();
		method @FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") @Nullable @RequiresPermission(android.Manifest.permission.SET_BIOMETRIC_DIALOG_ADVANCED) public android.graphics.Bitmap getLogoBitmap();
		method @FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") @Nullable @RequiresPermission(android.Manifest.permission.SET_BIOMETRIC_DIALOG_ADVANCED) public String getLogoDescription();
		method @FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") @DrawableRes @RequiresPermission(android.Manifest.permission.SET_BIOMETRIC_DIALOG_ADVANCED) public int getLogoRes();
		method @Nullable @RequiresPermission(android.Manifest.permission.SET_BIOMETRIC_DIALOG_ADVANCED) public android.graphics.Bitmap getLogoBitmap();
		method @Nullable @RequiresPermission(android.Manifest.permission.SET_BIOMETRIC_DIALOG_ADVANCED) public String getLogoDescription();
		method @DrawableRes @RequiresPermission(android.Manifest.permission.SET_BIOMETRIC_DIALOG_ADVANCED) public int getLogoRes();
		method @Nullable public CharSequence getNegativeButtonText();
		method @Nullable public CharSequence getSubtitle();
		method @NonNull public CharSequence getTitle();
		@@ -19156,12 +19156,12 @@ package android.hardware.biometrics {
		method @NonNull public android.hardware.biometrics.BiometricPrompt build();
		method @NonNull public android.hardware.biometrics.BiometricPrompt.Builder setAllowedAuthenticators(int);
		method @NonNull public android.hardware.biometrics.BiometricPrompt.Builder setConfirmationRequired(boolean);
		method @FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") @NonNull public android.hardware.biometrics.BiometricPrompt.Builder setContentView(@NonNull android.hardware.biometrics.PromptContentView);
		method @NonNull public android.hardware.biometrics.BiometricPrompt.Builder setContentView(@NonNull android.hardware.biometrics.PromptContentView);
		method @NonNull public android.hardware.biometrics.BiometricPrompt.Builder setDescription(@NonNull CharSequence);
		method @Deprecated @NonNull public android.hardware.biometrics.BiometricPrompt.Builder setDeviceCredentialAllowed(boolean);
		method @FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") @NonNull @RequiresPermission(android.Manifest.permission.SET_BIOMETRIC_DIALOG_ADVANCED) public android.hardware.biometrics.BiometricPrompt.Builder setLogoBitmap(@NonNull android.graphics.Bitmap);
		method @FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") @NonNull @RequiresPermission(android.Manifest.permission.SET_BIOMETRIC_DIALOG_ADVANCED) public android.hardware.biometrics.BiometricPrompt.Builder setLogoDescription(@NonNull String);
		method @FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") @NonNull @RequiresPermission(android.Manifest.permission.SET_BIOMETRIC_DIALOG_ADVANCED) public android.hardware.biometrics.BiometricPrompt.Builder setLogoRes(@DrawableRes int);
		method @NonNull @RequiresPermission(android.Manifest.permission.SET_BIOMETRIC_DIALOG_ADVANCED) public android.hardware.biometrics.BiometricPrompt.Builder setLogoBitmap(@NonNull android.graphics.Bitmap);
		method @NonNull @RequiresPermission(android.Manifest.permission.SET_BIOMETRIC_DIALOG_ADVANCED) public android.hardware.biometrics.BiometricPrompt.Builder setLogoDescription(@NonNull String);
		method @NonNull @RequiresPermission(android.Manifest.permission.SET_BIOMETRIC_DIALOG_ADVANCED) public android.hardware.biometrics.BiometricPrompt.Builder setLogoRes(@DrawableRes int);
		method @NonNull public android.hardware.biometrics.BiometricPrompt.Builder setNegativeButton(@NonNull CharSequence, @NonNull java.util.concurrent.Executor, @NonNull android.content.DialogInterface.OnClickListener);
		method @NonNull public android.hardware.biometrics.BiometricPrompt.Builder setSubtitle(@NonNull CharSequence);
		method @NonNull public android.hardware.biometrics.BiometricPrompt.Builder setTitle(@NonNull CharSequence);
		@@ -19184,27 +19184,27 @@ package android.hardware.biometrics {
		method @Nullable public java.security.Signature getSignature();
		}

		@FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") public interface PromptContentItem {
		public interface PromptContentItem {
		}

		@FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") public final class PromptContentItemBulletedText implements android.os.Parcelable android.hardware.biometrics.PromptContentItem {
		public final class PromptContentItemBulletedText implements android.os.Parcelable android.hardware.biometrics.PromptContentItem {
		ctor public PromptContentItemBulletedText(@NonNull String);
		method public int describeContents();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.hardware.biometrics.PromptContentItemBulletedText> CREATOR;
		}

		@FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") public final class PromptContentItemPlainText implements android.os.Parcelable android.hardware.biometrics.PromptContentItem {
		public final class PromptContentItemPlainText implements android.os.Parcelable android.hardware.biometrics.PromptContentItem {
		ctor public PromptContentItemPlainText(@NonNull String);
		method public int describeContents();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.hardware.biometrics.PromptContentItemPlainText> CREATOR;
		}

		@FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") public interface PromptContentView {
		public interface PromptContentView {
		}

		@FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") public final class PromptContentViewWithMoreOptionsButton implements android.os.Parcelable android.hardware.biometrics.PromptContentView {
		public final class PromptContentViewWithMoreOptionsButton implements android.os.Parcelable android.hardware.biometrics.PromptContentView {
		method public int describeContents();
		method @Nullable @RequiresPermission(android.Manifest.permission.SET_BIOMETRIC_DIALOG_ADVANCED) public String getDescription();
		method @NonNull @RequiresPermission(android.Manifest.permission.SET_BIOMETRIC_DIALOG_ADVANCED) public android.content.DialogInterface.OnClickListener getMoreOptionsButtonListener();
		@@ -19219,7 +19219,7 @@ package android.hardware.biometrics {
		method @NonNull @RequiresPermission(android.Manifest.permission.SET_BIOMETRIC_DIALOG_ADVANCED) public android.hardware.biometrics.PromptContentViewWithMoreOptionsButton.Builder setMoreOptionsButtonListener(@NonNull java.util.concurrent.Executor, @NonNull android.content.DialogInterface.OnClickListener);
		}

		@FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") public final class PromptVerticalListContentView implements android.os.Parcelable android.hardware.biometrics.PromptContentView {
		public final class PromptVerticalListContentView implements android.os.Parcelable android.hardware.biometrics.PromptContentView {
		method public int describeContents();
		method @Nullable public String getDescription();
		method @NonNull public java.util.List<android.hardware.biometrics.PromptContentItem> getListItems();

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

+0 −9

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ import static android.Manifest.permission.USE_BIOMETRIC;
		import static android.Manifest.permission.USE_BIOMETRIC_INTERNAL;
		import static android.hardware.biometrics.BiometricManager.Authenticators;
		import static android.hardware.biometrics.Flags.FLAG_ADD_KEY_AGREEMENT_CRYPTO_OBJECT;
		import static android.hardware.biometrics.Flags.FLAG_CUSTOM_BIOMETRIC_PROMPT;
		import static android.hardware.biometrics.Flags.FLAG_GET_OP_ID_CRYPTO_OBJECT;
		import static android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE;

		@@ -200,7 +199,6 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan
		* @param logoRes A drawable resource of the logo that will be shown on the prompt.
		* @return This builder.
		*/
		@FlaggedApi(FLAG_CUSTOM_BIOMETRIC_PROMPT)
		@RequiresPermission(SET_BIOMETRIC_DIALOG_ADVANCED)
		@NonNull
		public BiometricPrompt.Builder setLogoRes(@DrawableRes int logoRes) {
		@@ -226,7 +224,6 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan
		* @param logoBitmap A bitmap drawable of the logo that will be shown on the prompt.
		* @return This builder.
		*/
		@FlaggedApi(FLAG_CUSTOM_BIOMETRIC_PROMPT)
		@RequiresPermission(SET_BIOMETRIC_DIALOG_ADVANCED)
		@NonNull
		public BiometricPrompt.Builder setLogoBitmap(@NonNull Bitmap logoBitmap) {
		@@ -250,7 +247,6 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan
		* @return This builder.
		* @throws IllegalArgumentException If logo description is null.
		*/
		@FlaggedApi(FLAG_CUSTOM_BIOMETRIC_PROMPT)
		@RequiresPermission(SET_BIOMETRIC_DIALOG_ADVANCED)
		@NonNull
		public BiometricPrompt.Builder setLogoDescription(@NonNull String logoDescription) {
		@@ -342,7 +338,6 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan
		* @param view The customized view information.
		* @return This builder.
		*/
		@FlaggedApi(FLAG_CUSTOM_BIOMETRIC_PROMPT)
		@NonNull
		public BiometricPrompt.Builder setContentView(@NonNull PromptContentView view) {
		mPromptInfo.setContentView(view);
		@@ -851,7 +846,6 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan
		*
		* @return The drawable resource of the logo, or 0 if the prompt has no logo resource set.
		*/
		@FlaggedApi(FLAG_CUSTOM_BIOMETRIC_PROMPT)
		@RequiresPermission(SET_BIOMETRIC_DIALOG_ADVANCED)
		@DrawableRes
		public int getLogoRes() {
		@@ -864,7 +858,6 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan
		*
		* @return The logo bitmap of the prompt, or null if the prompt has no logo bitmap set.
		*/
		@FlaggedApi(FLAG_CUSTOM_BIOMETRIC_PROMPT)
		@RequiresPermission(SET_BIOMETRIC_DIALOG_ADVANCED)
		@Nullable
		public Bitmap getLogoBitmap() {
		@@ -879,7 +872,6 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan
		* @return The logo description of the prompt, or null if the prompt has no logo description
		* set.
		*/
		@FlaggedApi(FLAG_CUSTOM_BIOMETRIC_PROMPT)
		@RequiresPermission(SET_BIOMETRIC_DIALOG_ADVANCED)
		@Nullable
		public String getLogoDescription() {
		@@ -939,7 +931,6 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan
		*
		* @return The content view for the prompt, or null if the prompt has no content view.
		*/
		@FlaggedApi(FLAG_CUSTOM_BIOMETRIC_PROMPT)
		@Nullable
		public PromptContentView getContentView() {
		return mPromptInfo.getContentView();

core/java/android/hardware/biometrics/PromptContentItem.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -16,14 +16,9 @@

		package android.hardware.biometrics;

		import static android.hardware.biometrics.Flags.FLAG_CUSTOM_BIOMETRIC_PROMPT;

		import android.annotation.FlaggedApi;

		/**
		* An item shown on {@link PromptContentView}.
		*/
		@FlaggedApi(FLAG_CUSTOM_BIOMETRIC_PROMPT)
		public interface PromptContentItem {
		}

core/java/android/hardware/biometrics/PromptContentItemBulletedText.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -16,9 +16,6 @@

		package android.hardware.biometrics;

		import static android.hardware.biometrics.Flags.FLAG_CUSTOM_BIOMETRIC_PROMPT;

		import android.annotation.FlaggedApi;
		import android.annotation.NonNull;
		import android.os.Parcel;
		import android.os.Parcelable;
		@@ -26,7 +23,6 @@ import android.os.Parcelable;
		/**
		* A list item with bulleted text shown on {@link PromptVerticalListContentView}.
		*/
		@FlaggedApi(FLAG_CUSTOM_BIOMETRIC_PROMPT)
		public final class PromptContentItemBulletedText implements PromptContentItemParcelable {
		private final String mText;

core/java/android/hardware/biometrics/PromptContentItemParcelable.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -16,15 +16,11 @@

		package android.hardware.biometrics;

		import static android.hardware.biometrics.Flags.FLAG_CUSTOM_BIOMETRIC_PROMPT;

		import android.annotation.FlaggedApi;
		import android.os.Parcelable;

		/**
		* A parcelable {@link PromptContentItem}.
		*/
		@FlaggedApi(FLAG_CUSTOM_BIOMETRIC_PROMPT)
		sealed interface PromptContentItemParcelable extends PromptContentItem, Parcelable
		permits PromptContentItemPlainText, PromptContentItemBulletedText {
		}