diff options
author | Scott Mertz <scott@cyngn.com> | 2016-04-13 19:47:29 -0700 |
---|---|---|
committer | Roman Birg <roman@cyngn.com> | 2016-04-14 13:17:09 -0700 |
commit | 2ae2ee68efc22649509fc68cc525b9f67b882736 (patch) | |
tree | 6c1aa500c3abc297b240c3042f43ce89e8b72042 /packages | |
parent | c694ab1c51081097089e2d546742cf6213689158 (diff) | |
download | frameworks_base-2ae2ee68efc22649509fc68cc525b9f67b882736.zip frameworks_base-2ae2ee68efc22649509fc68cc525b9f67b882736.tar.gz frameworks_base-2ae2ee68efc22649509fc68cc525b9f67b882736.tar.bz2 |
LockPatternUtils: Use the actual user id to set pattern size
Ticket: CYNGNOS-2462
Change-Id: Ia68e26ec2dfc23317135d933bc25204c1380bb02
Diffstat (limited to 'packages')
-rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java | 2 | ||||
-rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java index e8dd871..f40d4fe 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java @@ -133,7 +133,7 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit mLockPatternView.setSaveEnabled(false); mLockPatternView.setOnPatternListener(new UnlockPatternListener()); mLockPatternView.setLockPatternUtils(mLockPatternUtils); - mLockPatternView.setLockPatternSize(mLockPatternUtils.getLockPatternSize()); + mLockPatternView.setLockPatternSize(mLockPatternUtils.getLockPatternSize(KeyguardUpdateMonitor.getCurrentUser())); mLockPatternView.setVisibleDots(mLockPatternUtils.isVisibleDotsEnabled( KeyguardUpdateMonitor.getCurrentUser())); diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index 92e4f83..143d4ec 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -2250,7 +2250,7 @@ class DatabaseHelper extends SQLiteOpenHelper { try { LockPatternUtils lpu = new LockPatternUtils(mContext); List<LockPatternView.Cell> cellPattern = - LockPatternUtils.stringToPattern(lockPattern, lpu.getLockPatternSize()); + LockPatternUtils.stringToPattern(lockPattern, lpu.getLockPatternSize(mUserHandle)); lpu.saveLockPattern(cellPattern, null, UserHandle.USER_OWNER); } catch (IllegalArgumentException e) { // Don't want corrupted lock pattern to hang the reboot process |