diff options
| author | Adrian Roos <roosa@google.com> | 2014-03-31 19:26:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-31 19:26:14 +0000 |
| commit | 78d9aece821cf8f40eb95aa962cb3ea707669413 (patch) | |
| tree | 8febf46597b07c703dbcdb7579049b304beab9bf /packages/SystemUI/src/com/android/systemui/keyguard | |
| parent | e6978cda7110823f70cc74319c37bd512866c6f1 (diff) | |
| parent | 46842d946d1777c22f05e6bb96933c1b5cbd00d4 (diff) | |
| download | frameworks_base-78d9aece821cf8f40eb95aa962cb3ea707669413.zip frameworks_base-78d9aece821cf8f40eb95aa962cb3ea707669413.tar.gz frameworks_base-78d9aece821cf8f40eb95aa962cb3ea707669413.tar.bz2 | |
am 46842d94: Make Keyguard trust aware
* commit '46842d946d1777c22f05e6bb96933c1b5cbd00d4':
Make Keyguard trust aware
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/keyguard')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index 39ec86f..b300bea 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -499,7 +499,9 @@ public class KeyguardViewMediator { @Override public int getSessionType() { - return mLockPatternUtils.isSecure() ? Session.TYPE_KEYGUARD_SECURE + return mLockPatternUtils.isSecure() && !mUpdateMonitor.getUserHasTrust( + mLockPatternUtils.getCurrentUser()) + ? Session.TYPE_KEYGUARD_SECURE : Session.TYPE_KEYGUARD_INSECURE; } }, new File(mContext.getCacheDir(), "keyguard_analytics.bin")); |