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

Merge changes from topic "lockoutreset" into rvc-dev

Browse Source 
* changes:
  Add missing permission check for addLockoutResetCallback
  Add null pointer check for addLockoutResetCallback
This commit is contained in:
Kevin Chyn
2020-05-15 22:12:00 +00:00
committed by Android (Google) Code Review
parent 04e5ed5223 932fd9bda0
commit 8838c087b0
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/biometrics/BiometricServiceBase.java
View File

@@ -978,6 +978,10 @@ public abstract class BiometricServiceBase extends SystemService
} }
protected void addLockoutResetCallback(IBiometricServiceLockoutResetCallback callback) { protected void addLockoutResetCallback(IBiometricServiceLockoutResetCallback callback) {
if (callback == null) {
Slog.w(getTag(), "Null LockoutResetCallback");
return;
}
mHandler.post(() -> { mHandler.post(() -> {
final LockoutResetMonitor monitor = new LockoutResetMonitor(callback); final LockoutResetMonitor monitor = new LockoutResetMonitor(callback);
if (!mLockoutMonitors.contains(monitor)) { if (!mLockoutMonitors.contains(monitor)) {

1
services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java
View File

@@ -330,6 +330,7 @@ public class FingerprintService extends BiometricServiceBase {
@Override @Override
public void addLockoutResetCallback(final IBiometricServiceLockoutResetCallback callback) public void addLockoutResetCallback(final IBiometricServiceLockoutResetCallback callback)
throws RemoteException { throws RemoteException {
checkPermission(USE_BIOMETRIC_INTERNAL);
FingerprintService.super.addLockoutResetCallback(callback); FingerprintService.super.addLockoutResetCallback(callback);
} }