commit | 1de8bcb1e51917a301cab2ef7d276b4f9423d95f | [log] [tgz] |
---|---|---|
author | Adrian Roos <roosa@google.com> | Wed Aug 19 16:52:52 2015 -0700 |
committer | Adrian Roos <roosa@google.com> | Fri Aug 21 13:28:01 2015 -0700 |
tree | 5039588a96d4bf5c7d06283dee74e4edcb95d1e9 | |
parent | b5e4722891e7bbf2fffcd995af02838667a3abab [diff] |
Invoke strong auth callback and default strong auth expired to true Split off from I0af11da1b7cd7c8d837bc5ba3a62ef2ffca74b1b. The initial value did not matter previously because a SystemUI crash triggered the boot logic and forced a manual entry before fingerprint works. Long term the timeout logic should be moved to StrongAuthTracker so it can be shared with the trust agent implementation (currently implemented by the trust agents themeselfes) Bug: 22846469 Bug: 22115393 Change-Id: I0af11da1b7cd7c8d837bc5ba3a62ef2ffca74b1b
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java index 4da9acd..579889d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
@@ -649,7 +649,7 @@ } @Override - public void onStrongAuthTimeoutExpiredChanged(int userId) { + public void onStrongAuthStateChanged(int userId) { mLockIcon.update(); } };
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java index 8b96e5f..893b352 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
@@ -52,7 +52,7 @@ private KeyguardUpdateMonitorCallback mUpdateMonitorCallback = new KeyguardUpdateMonitorCallback() { @Override - public void onStrongAuthTimeoutExpiredChanged(int userId) { + public void onStrongAuthStateChanged(int userId) { mBouncerPromptReason = mCallback.getBouncerPromptReason(); } };
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockMethodCache.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockMethodCache.java index 091db76..a91cd51 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockMethodCache.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockMethodCache.java
@@ -145,7 +145,7 @@ } @Override - public void onStrongAuthTimeoutExpiredChanged(int userId) { + public void onStrongAuthStateChanged(int userId) { update(false /* updateAlways */); } };