From 2ae2ee68efc22649509fc68cc525b9f67b882736 Mon Sep 17 00:00:00 2001 From: Scott Mertz Date: Wed, 13 Apr 2016 19:47:29 -0700 Subject: LockPatternUtils: Use the actual user id to set pattern size Ticket: CYNGNOS-2462 Change-Id: Ia68e26ec2dfc23317135d933bc25204c1380bb02 --- packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java | 2 +- .../src/com/android/providers/settings/DatabaseHelper.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') 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 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 -- cgit v1.1