diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-04-03 16:12:54 +0200 |
|---|---|---|
| committer | Jorim Jaggi <jjaggi@google.com> | 2014-04-05 17:05:56 +0200 |
| commit | 0bed7f258ba1fffc10f986ee043b769f1fd40ad3 (patch) | |
| tree | 4bd0086011bcb93b6ad97bba121d2111429c14aa /packages/Keyguard/src/com/android | |
| parent | 649b7081dfb1647bd121dfc476f353bd1c799997 (diff) | |
| download | frameworks_base-0bed7f258ba1fffc10f986ee043b769f1fd40ad3.zip frameworks_base-0bed7f258ba1fffc10f986ee043b769f1fd40ad3.tar.gz frameworks_base-0bed7f258ba1fffc10f986ee043b769f1fd40ad3.tar.bz2 | |
Always go through bouncer when unlocking
Previously, we skipped the bouncer when the user didn't had a
security method set. Users without a security method couldn't unlock
their SIM cards though. This change moves the responsibility to
decide what to do to bouncer, so SIM pin is still shown with users
without secrity methods. The bouncer will still be skipped if no
authentication is required.
Bug: 13635952
Change-Id: I0b43628c37d769515e97c29fc5fb5337fe46526f
Diffstat (limited to 'packages/Keyguard/src/com/android')
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardViewBase.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardViewBase.java b/packages/Keyguard/src/com/android/keyguard/KeyguardViewBase.java index d3a5941..2ea8f85 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardViewBase.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardViewBase.java @@ -120,9 +120,11 @@ public abstract class KeyguardViewBase extends FrameLayout implements SecurityCa /** * Dismisses the keyguard by going to the next screen or making it gone. + * + * @return True if the keyguard is done. */ - public void dismiss() { - dismiss(false); + public boolean dismiss() { + return dismiss(false); } private void setBackButtonEnabled(boolean enabled) { |