diff options
| author | Adrian Roos <roosa@google.com> | 2015-04-16 17:11:22 -0700 |
|---|---|---|
| committer | Adrian Roos <roosa@google.com> | 2015-04-28 12:01:09 -0700 |
| commit | 5437588abd69bf3eff59684528aaf50e09b6cffc (patch) | |
| tree | e2b8b27419fbf1473748b6550d224b6212c185a2 /src/com/android/settings/TrustAgentSettings.java | |
| parent | bc95630994227736aff46885ca1d9345829e83e2 (diff) | |
| download | packages_apps_Settings-5437588abd69bf3eff59684528aaf50e09b6cffc.zip packages_apps_Settings-5437588abd69bf3eff59684528aaf50e09b6cffc.tar.gz packages_apps_Settings-5437588abd69bf3eff59684528aaf50e09b6cffc.tar.bz2 | |
Require explicit userId in LockPatternUtils
Bug: 18931518
Change-Id: Ie2faa18918aaadf17a84287898438549a693b0cc
Diffstat (limited to 'src/com/android/settings/TrustAgentSettings.java')
| -rw-r--r-- | src/com/android/settings/TrustAgentSettings.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/settings/TrustAgentSettings.java b/src/com/android/settings/TrustAgentSettings.java index 4c6b4ee..37a86eb 100644 --- a/src/com/android/settings/TrustAgentSettings.java +++ b/src/com/android/settings/TrustAgentSettings.java @@ -26,6 +26,7 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.graphics.drawable.Drawable; import android.os.Bundle; +import android.os.UserHandle; import android.preference.Preference; import android.preference.PreferenceGroup; import android.preference.SwitchPreference; @@ -120,14 +121,16 @@ public class TrustAgentSettings extends SettingsPreferenceFragment implements } private void loadActiveAgents() { - List<ComponentName> activeTrustAgents = mLockPatternUtils.getEnabledTrustAgents(); + List<ComponentName> activeTrustAgents = mLockPatternUtils.getEnabledTrustAgents( + UserHandle.myUserId()); if (activeTrustAgents != null) { mActiveAgents.addAll(activeTrustAgents); } } private void saveActiveAgents() { - mLockPatternUtils.setEnabledTrustAgents(mActiveAgents); + mLockPatternUtils.setEnabledTrustAgents(mActiveAgents, + UserHandle.myUserId()); } ArrayMap<ComponentName, AgentInfo> findAvailableTrustAgents() { |