Merge "Add NonNull to remaining BiometricPrompt Builder methods" (d4596b4e) · Commits · e / os / android_frameworks_base

api/current.txt

+5 −5

Original line number	Diff line number	Diff line
		@@ -16558,13 +16558,13 @@ package android.hardware.biometrics {

		public static class BiometricPrompt.Builder {
		ctor public BiometricPrompt.Builder(android.content.Context);
		method public android.hardware.biometrics.BiometricPrompt build();
		method @NonNull public android.hardware.biometrics.BiometricPrompt build();
		method @NonNull public android.hardware.biometrics.BiometricPrompt.Builder setAllowDeviceCredential(boolean);
		method public android.hardware.biometrics.BiometricPrompt.Builder setDescription(@NonNull CharSequence);
		method 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 setDescription(@NonNull CharSequence);
		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 setRequireConfirmation(boolean);
		method public android.hardware.biometrics.BiometricPrompt.Builder setSubtitle(@NonNull CharSequence);
		method public android.hardware.biometrics.BiometricPrompt.Builder setTitle(@NonNull CharSequence);
		method @NonNull public android.hardware.biometrics.BiometricPrompt.Builder setSubtitle(@NonNull CharSequence);
		method @NonNull public android.hardware.biometrics.BiometricPrompt.Builder setTitle(@NonNull CharSequence);
		}

		public static final class BiometricPrompt.CryptoObject {

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

+7 −7

Original line number	Diff line number	Diff line
		@@ -139,7 +139,7 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan
		* @param title
		* @return
		*/
		public Builder setTitle(@NonNull CharSequence title) {
		@NonNull public Builder setTitle(@NonNull CharSequence title) {
		mBundle.putCharSequence(KEY_TITLE, title);
		return this;
		}
		@@ -150,7 +150,7 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan
		* @hide
		*/
		@RequiresPermission(USE_BIOMETRIC_INTERNAL)
		public Builder setUseDefaultTitle() {
		@NonNull public Builder setUseDefaultTitle() {
		mBundle.putBoolean(KEY_USE_DEFAULT_TITLE, true);
		return this;
		}
		@@ -160,7 +160,7 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan
		* @param subtitle
		* @return
		*/
		public Builder setSubtitle(@NonNull CharSequence subtitle) {
		@NonNull public Builder setSubtitle(@NonNull CharSequence subtitle) {
		mBundle.putCharSequence(KEY_SUBTITLE, subtitle);
		return this;
		}
		@@ -170,7 +170,7 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan
		* @param description
		* @return
		*/
		public Builder setDescription(@NonNull CharSequence description) {
		@NonNull public Builder setDescription(@NonNull CharSequence description) {
		mBundle.putCharSequence(KEY_DESCRIPTION, description);
		return this;
		}
		@@ -182,7 +182,7 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan
		* @return
		* @hide
		*/
		public Builder setPositiveButton(@NonNull CharSequence text,
		@NonNull public Builder setPositiveButton(@NonNull CharSequence text,
		@NonNull @CallbackExecutor Executor executor,
		@NonNull DialogInterface.OnClickListener listener) {
		if (TextUtils.isEmpty(text)) {
		@@ -210,7 +210,7 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan
		* @param text
		* @return
		*/
		public Builder setNegativeButton(@NonNull CharSequence text,
		@NonNull public Builder setNegativeButton(@NonNull CharSequence text,
		@NonNull @CallbackExecutor Executor executor,
		@NonNull DialogInterface.OnClickListener listener) {
		if (TextUtils.isEmpty(text)) {
		@@ -275,7 +275,7 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan
		* @return a {@link BiometricPrompt}
		* @throws IllegalArgumentException if any of the required fields are not set.
		*/
		public BiometricPrompt build() {
		@NonNull 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);