diff options
author | Beverly <beverlyt@google.com> | 2021-07-07 16:41:47 -0400 |
---|---|---|
committer | Beverly <beverlyt@google.com> | 2021-07-07 19:30:38 -0400 |
commit | 94d6c35f3305afd0f29c913a6df3ba06c1b98fb3 (patch) | |
tree | ce8da826243e4885ab2aa8f52017ac1109e0bb92 /packages/SystemUI/src/com/android/keyguard/KeyguardMessageAreaController.java | |
parent | 75599c9e70a60f124dba23ae1cbce7028e830f7c (diff) |
Allow bypass + show errors on alt bouncer
- Show the keyguard bouncer errors so users are aware of auth errors
- Also fixes a bug where we wouldn't proceed to the activity (ie:
notification click) if the user authenticated from the alt bouncer
using passive auth. now, the bypass logic includes when the alt bouncer
is showing.
Test: manual
Fixes: 186313318
Fixes: 192355757
Change-Id: I3caffd2e89b9ae596b11ca4a05665db53491c2d2
Diffstat (limited to 'packages/SystemUI/src/com/android/keyguard/KeyguardMessageAreaController.java')
-rw-r--r-- | packages/SystemUI/src/com/android/keyguard/KeyguardMessageAreaController.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardMessageAreaController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardMessageAreaController.java index 6e40f025da50..51ded3fcafdf 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardMessageAreaController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardMessageAreaController.java @@ -28,7 +28,7 @@ import javax.inject.Inject; public class KeyguardMessageAreaController extends ViewController<KeyguardMessageArea> { private final KeyguardUpdateMonitor mKeyguardUpdateMonitor; private final ConfigurationController mConfigurationController; - + private boolean mAltBouncerShowing; private KeyguardUpdateMonitorCallback mInfoCallback = new KeyguardUpdateMonitorCallback() { public void onFinishedGoingToSleep(int why) { @@ -81,6 +81,13 @@ public class KeyguardMessageAreaController extends ViewController<KeyguardMessag mKeyguardUpdateMonitor.removeCallback(mInfoCallback); } + /** + * Set whether alt bouncer is showing + */ + public void setAltBouncerShowing(boolean showing) { + mView.setAltBouncerShowing(showing); + } + public void setMessage(CharSequence s) { mView.setMessage(s); } |