Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't attempt caching for BiometricManager.Strings" into sc-dev

Browse Source
This commit is contained in:
Curtis Belmonte
2021-07-01 20:47:01 +00:00
committed by Android (Google) Code Review
parent a3d48ea4b3 8858de4478
commit 80cfdd10db
1 changed files with 18 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/hardware/biometrics/BiometricManager.java
View File

@@ -223,10 +223,6 @@ public class BiometricManager {
@NonNull private final IAuthService mService; @NonNull private final IAuthService mService;
@Authenticators.Types int mAuthenticators; @Authenticators.Types int mAuthenticators;
@Nullable CharSequence mButtonLabel;
@Nullable CharSequence mPromptMessage;
@Nullable CharSequence mSettingName;
private Strings(@NonNull Context context, @NonNull IAuthService service, private Strings(@NonNull Context context, @NonNull IAuthService service,
@Authenticators.Types int authenticators) { @Authenticators.Types int authenticators) {
mContext = context; mContext = context;
@@ -259,17 +255,14 @@ public class BiometricManager {
@RequiresPermission(USE_BIOMETRIC) @RequiresPermission(USE_BIOMETRIC)
@Nullable @Nullable
public CharSequence getButtonLabel() { public CharSequence getButtonLabel() {
if (mButtonLabel == null) {
final int userId = mContext.getUserId(); final int userId = mContext.getUserId();
final String opPackageName = mContext.getOpPackageName(); final String opPackageName = mContext.getOpPackageName();
try { try {
mButtonLabel = mService.getButtonLabel(userId, opPackageName, mAuthenticators); return mService.getButtonLabel(userId, opPackageName, mAuthenticators);
} catch (RemoteException e) { } catch (RemoteException e) {
throw e.rethrowFromSystemServer(); throw e.rethrowFromSystemServer();
} }
} }
return mButtonLabel;
}
/** /**
* Provides a localized string that can be shown while the user is authenticating with * Provides a localized string that can be shown while the user is authenticating with
@@ -296,7 +289,6 @@ public class BiometricManager {
@RequiresPermission(USE_BIOMETRIC) @RequiresPermission(USE_BIOMETRIC)
@Nullable @Nullable
public CharSequence getPromptMessage() { public CharSequence getPromptMessage() {
if (mPromptMessage == null) {
final int userId = mContext.getUserId(); final int userId = mContext.getUserId();
final String opPackageName = mContext.getOpPackageName(); final String opPackageName = mContext.getOpPackageName();
try { try {
@@ -305,8 +297,6 @@ public class BiometricManager {
throw e.rethrowFromSystemServer(); throw e.rethrowFromSystemServer();
} }
} }
return mPromptMessage;
}
/** /**
* Provides a localized string that can be shown as the title for an app setting that * Provides a localized string that can be shown as the title for an app setting that
@@ -335,7 +325,6 @@ public class BiometricManager {
@RequiresPermission(USE_BIOMETRIC) @RequiresPermission(USE_BIOMETRIC)
@Nullable @Nullable
public CharSequence getSettingName() { public CharSequence getSettingName() {
if (mSettingName == null) {
final int userId = mContext.getUserId(); final int userId = mContext.getUserId();
final String opPackageName = mContext.getOpPackageName(); final String opPackageName = mContext.getOpPackageName();
try { try {
@@ -344,8 +333,6 @@ public class BiometricManager {
throw e.rethrowFromSystemServer(); throw e.rethrowFromSystemServer();
} }
} }
return mSettingName;
}
} }
@NonNull private final Context mContext; @NonNull private final Context mContext;