diff options
author | Adrian Roos <roosa@google.com> | 2014-09-08 19:23:00 +0200 |
---|---|---|
committer | Adrian Roos <roosa@google.com> | 2014-09-08 19:23:00 +0200 |
commit | b60d47ccefc7e4bcee81a91b108244b7dbdd7081 (patch) | |
tree | 4cebea72a7cde570580e02f2f32a2109936944ea /packages/SystemUI/src/com/android/systemui/keyguard | |
parent | 2dbf3eac537b9351d34649a9bd185f936ff6528c (diff) | |
download | frameworks_base-b60d47ccefc7e4bcee81a91b108244b7dbdd7081.zip frameworks_base-b60d47ccefc7e4bcee81a91b108244b7dbdd7081.tar.gz frameworks_base-b60d47ccefc7e4bcee81a91b108244b7dbdd7081.tar.bz2 |
Initilize LockPatternUtils with the current user
Prevents us from ending up with the wrong user in case
of SystemUI restarts.
Bug: 17343537
Change-Id: I40282380740f8b58adc72d24cb01d1018f07cfe7
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/keyguard')
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java | 3 |
1 files changed, 2 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 8d35eb0..50ba68e 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -17,6 +17,7 @@ package com.android.systemui.keyguard; import android.app.Activity; +import android.app.ActivityManager; import android.app.ActivityManagerNative; import android.app.AlarmManager; import android.app.PendingIntent; @@ -487,7 +488,7 @@ public class KeyguardViewMediator extends SystemUI { mUpdateMonitor = KeyguardUpdateMonitor.getInstance(mContext); mLockPatternUtils = new LockPatternUtils(mContext); - mLockPatternUtils.setCurrentUser(UserHandle.USER_OWNER); + mLockPatternUtils.setCurrentUser(ActivityManager.getCurrentUser()); // Assume keyguard is showing (unless it's disabled) until we know for sure... mShowing = (mUpdateMonitor.isDeviceProvisioned() || mLockPatternUtils.isSecure()) |