From 135619d483d324cd0c5b565b93723953c1ff5a4a Mon Sep 17 00:00:00 2001 From: Salvador Martinez Date: Mon, 7 Aug 2017 10:22:37 -0700 Subject: [PATCH] Refactor tether logic for reuse Some logic related to permissions needs to be used elsewhere. This CL refactors the relevant code into a method so that it stays in sync in both places. Test: robotests still pass Bug: 64092292 Change-Id: If8191698023d1da90db99b518d9f770683b5c789 Merged-In: I3b54529865e16b7e1640b0adda7f7edb9d1a41f7 --- .../settings/network/TetherPreferenceController.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/network/TetherPreferenceController.java b/src/com/android/settings/network/TetherPreferenceController.java index b865ea5b268..933bc8a33a5 100644 --- a/src/com/android/settings/network/TetherPreferenceController.java +++ b/src/com/android/settings/network/TetherPreferenceController.java @@ -88,8 +88,7 @@ public class TetherPreferenceController extends PreferenceController public TetherPreferenceController(Context context, Lifecycle lifecycle) { super(context); mBluetoothPan = new AtomicReference<>(); - mAdminDisallowedTetherConfig = checkIfRestrictionEnforced( - context, DISALLOW_CONFIG_TETHERING, UserHandle.myUserId()) != null; + mAdminDisallowedTetherConfig = isTetherConfigDisallowed(context); mConnectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter(); @@ -170,6 +169,11 @@ public class TetherPreferenceController extends PreferenceController } } + public static boolean isTetherConfigDisallowed(Context context) { + return checkIfRestrictionEnforced( + context, DISALLOW_CONFIG_TETHERING, UserHandle.myUserId()) != null; + } + @VisibleForTesting void updateSummary() { if (mPreference == null) {