Merge "Use the correct userId when checking if disabled by admin."

2016-02-04 19:14:16 +00:00
parent ae733cab7f f755baf1c3
commit 91e0ba7d40
7 changed files with 44 additions and 17 deletions
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -417,7 +417,7 @@ public class ChooseLockGeneric extends SettingsActivity {

            int adminEnforcedQuality = mDPM.getPasswordQuality(null);
            EnforcedAdmin enforcedAdmin = RestrictedLockUtils.checkIfPasswordQualityIsSet(
-                    getActivity());
+                    getActivity(), mUserId);
            for (int i = entries.getPreferenceCount() - 1; i >= 0; --i) {
                Preference pref = entries.getPreference(i);
                if (pref instanceof RestrictedPreference) {