Require explicit userId in LockPatternUtils

Bug: 18931518 Change-Id: Ie2faa18918aaadf17a84287898438549a693b0cc
2015-04-16 17:11:22 -07:00
parent bc95630994
commit 5437588abd
18 changed files with 112 additions and 69 deletions
--- a/src/com/android/settings/CryptKeeperConfirm.java
+++ b/src/com/android/settings/CryptKeeperConfirm.java
@@ -120,8 +120,10 @@ public class CryptKeeperConfirm extends InstrumentedFragment {

            // 1. The owner info.
            LockPatternUtils utils = new LockPatternUtils(getActivity());
-            utils.setVisiblePatternEnabled(utils.isVisiblePatternEnabled());
-            if (utils.isOwnerInfoEnabled()) {
+            utils.setVisiblePatternEnabled(
+                    utils.isVisiblePatternEnabled(UserHandle.USER_OWNER),
+                    UserHandle.USER_OWNER);
+            if (utils.isOwnerInfoEnabled(UserHandle.USER_OWNER)) {
                utils.setOwnerInfo(utils.getOwnerInfo(UserHandle.USER_OWNER),
                                   UserHandle.USER_OWNER);
            }