diff options
| author | Philip P. Moltmann <moltmann@google.com> | 2018-08-28 14:57:49 -0700 |
|---|---|---|
| committer | Philip P. Moltmann <moltmann@google.com> | 2018-08-30 11:59:29 -0700 |
| commit | 4e615e698643fe3815dcc2320cdd420a5cc1f86b (patch) | |
| tree | 178c847079a888c33f109e8084e458d3df6ad6f6 /packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java | |
| parent | 0f9755bcd77f70ae0c9ce9fae650aa1703636648 (diff) | |
Factor some RestrictedLockUtils out of SettingLib
Also make the new lib only use system-apis.
This allows mainline module to use the new
RestrictedLockUtilsSettingLib.
Unfortunately the whole RestrictedLockUtils would have caused to much
new system-api. Hence it was split into RestrictedLockUtils and
RestrictedLockUtilsInternal. This caused a lot of trivial code changes.
Bug: 110953302
Test: Built
Change-Id: I693b3bf56f3be71f0790776e3aad5694717786ef
Diffstat (limited to 'packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java')
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java b/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java index 4b84920e7884..1ba1f72cb2e1 100644 --- a/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java +++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java @@ -62,7 +62,7 @@ public class RestrictedPreferenceHelper { } mAttrUserRestriction = data == null ? null : data.toString(); // If the system has set the user restriction, then we shouldn't add the padlock. - if (RestrictedLockUtils.hasBaseUserRestriction(mContext, mAttrUserRestriction, + if (RestrictedLockUtilsInternal.hasBaseUserRestriction(mContext, mAttrUserRestriction, UserHandle.myUserId())) { mAttrUserRestriction = null; return; @@ -133,7 +133,7 @@ public class RestrictedPreferenceHelper { * @param userId user to check the restriction for. */ public void checkRestrictionAndSetDisabled(String userRestriction, int userId) { - EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(mContext, + EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(mContext, userRestriction, userId); setDisabledByAdmin(admin); } |