Merge "Refactor tether logic for reuse" into oc-mr1-dev

This commit is contained in:
TreeHugger Robot
2017-08-08 18:53:39 +00:00
committed by Android (Google) Code Review

View File

@@ -88,8 +88,7 @@ public class TetherPreferenceController extends AbstractPreferenceController imp
public TetherPreferenceController(Context context, Lifecycle lifecycle) {
super(context);
mBluetoothPan = new AtomicReference<>();
mAdminDisallowedTetherConfig = checkIfRestrictionEnforced(
mContext, 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 AbstractPreferenceController imp
}
}
public static boolean isTetherConfigDisallowed(Context context) {
return checkIfRestrictionEnforced(
context, DISALLOW_CONFIG_TETHERING, UserHandle.myUserId()) != null;
}
@VisibleForTesting
void updateSummary() {
if (mPreference == null) {