Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 705a9e7e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents b1c0e382 52da8a79

src/com/android/settings/network/TetherPreferenceController.java

+6 −2
Original line number Diff line number Diff line
@@ -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) {