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

Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-08-11 17:26:07 +00:00
committed by Android (Google) Code Review
parent 2593d707f7 4dc098aed1
commit 60409a9255
4 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
View File

@@ -646,13 +646,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
return mStrongAuthTracker;
}
public void reportSuccessfulStrongAuthUnlockAttempt() {
if (mFpm != null) {
byte[] token = null; /* TODO: pass real auth token once fp HAL supports it */
mFpm.resetTimeout(token);
}
}
private void notifyStrongAuthStateChanged(int userId) {
for (int i = 0; i < mCallbacks.size(); i++) {
KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();

7
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
View File

@@ -560,9 +560,6 @@ public class KeyguardViewMediator extends SystemUI {
}
tryKeyguardDone();
if (strongAuth) {
mUpdateMonitor.reportSuccessfulStrongAuthUnlockAttempt();
}
}
@Override
@@ -591,9 +588,6 @@ public class KeyguardViewMediator extends SystemUI {
mStatusBarKeyguardViewManager.startPreHideAnimation(mHideAnimationFinishedRunnable);
mHandler.sendEmptyMessageDelayed(KEYGUARD_DONE_PENDING_TIMEOUT,
KEYGUARD_DONE_PENDING_TIMEOUT_MS);
if (strongAuth) {
mUpdateMonitor.reportSuccessfulStrongAuthUnlockAttempt();
}
Trace.endSection();
}
@@ -1288,7 +1282,6 @@ public class KeyguardViewMediator extends SystemUI {
// Without this, settings is not enabled until the lock screen first appears
setShowingLocked(false);
hideLocked();
mUpdateMonitor.reportSuccessfulStrongAuthUnlockAttempt();
return;
}
}

1
services/core/java/com/android/server/locksettings/LockSettingsService.java
View File

@@ -561,6 +561,7 @@ public class LockSettingsService extends ILockSettings.Stub {
mDeviceProvisionedObserver.onSystemReady();
// TODO: maybe skip this for split system user mode.
mStorage.prefetchUser(UserHandle.USER_SYSTEM);
mStrongAuth.systemReady();
}
private void migrateOldData() {

11
services/core/java/com/android/server/locksettings/LockSettingsStrongAuth.java
View File

@@ -27,6 +27,7 @@ import android.app.AlarmManager.OnAlarmListener;
import android.app.admin.DevicePolicyManager;
import android.app.trust.IStrongAuthTracker;
import android.content.Context;
import android.hardware.fingerprint.FingerprintManager;
import android.os.Binder;
import android.os.DeadObjectException;
import android.os.Handler;
@@ -64,6 +65,7 @@ public class LockSettingsStrongAuth {
private final Context mContext;
private AlarmManager mAlarmManager;
private FingerprintManager mFingerprintManager;
public LockSettingsStrongAuth(Context context) {
mContext = context;
@@ -71,6 +73,10 @@ public class LockSettingsStrongAuth {
mAlarmManager = context.getSystemService(AlarmManager.class);
}
public void systemReady() {
mFingerprintManager = mContext.getSystemService(FingerprintManager.class);
}
private void handleAddStrongAuthTracker(IStrongAuthTracker tracker) {
for (int i = 0; i < mStrongAuthTrackers.size(); i++) {
if (mStrongAuthTrackers.get(i).asBinder() == tracker.asBinder()) {
@@ -188,6 +194,11 @@ public class LockSettingsStrongAuth {
}
public void reportSuccessfulStrongAuthUnlock(int userId) {
if (mFingerprintManager != null) {
byte[] token = null; /* TODO: pass real auth token once fp HAL supports it */
mFingerprintManager.resetTimeout(token);
}
final int argNotUsed = 0;
mHandler.obtainMessage(MSG_SCHEDULE_STRONG_AUTH_TIMEOUT, userId, argNotUsed).sendToTarget();
}