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/TetherUtil.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/TetherUtil.java')
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/TetherUtil.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/TetherUtil.java b/packages/SettingsLib/src/com/android/settingslib/TetherUtil.java index a3ab4fdb6538..c3993e9063b2 100644 --- a/packages/SettingsLib/src/com/android/settingslib/TetherUtil.java +++ b/packages/SettingsLib/src/com/android/settingslib/TetherUtil.java @@ -57,9 +57,10 @@ public class TetherUtil { public static boolean isTetherAvailable(Context context) { final ConnectivityManager cm = context.getSystemService(ConnectivityManager.class); - final boolean tetherConfigDisallowed = RestrictedLockUtils.checkIfRestrictionEnforced( - context, DISALLOW_CONFIG_TETHERING, UserHandle.myUserId()) != null; - final boolean hasBaseUserRestriction = RestrictedLockUtils.hasBaseUserRestriction( + final boolean tetherConfigDisallowed = RestrictedLockUtilsInternal + .checkIfRestrictionEnforced(context, DISALLOW_CONFIG_TETHERING, + UserHandle.myUserId()) != null; + final boolean hasBaseUserRestriction = RestrictedLockUtilsInternal.hasBaseUserRestriction( context, DISALLOW_CONFIG_TETHERING, UserHandle.myUserId()); return (cm.isTetheringSupported() || tetherConfigDisallowed) && !hasBaseUserRestriction; } |