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

Commit 7828dda5 authored by Alex Johnston's avatar Alex Johnston Committed by Android (Google) Code Review
Browse files

Merge "Fix USB tethering grey out behaviour" into tm-dev

parents b6629ab5 e8bbf576

src/com/android/settings/TetherSettings.java

+5 −2
Original line number Diff line number Diff line
@@ -416,8 +416,11 @@ public class TetherSettings extends RestrictedSettingsFragment 
        if (usbTethered) {

            mUsbTether.setEnabled(!mDataSaverEnabled);

            mUsbTether.setChecked(true);

            mUsbTether.setDisabledByAdmin(

                    checkIfUsbDataSignalingIsDisabled(mContext, UserHandle.myUserId()));

            final RestrictedLockUtils.EnforcedAdmin enforcedAdmin =

                    checkIfUsbDataSignalingIsDisabled(mContext, UserHandle.myUserId());

            if (enforcedAdmin != null) {

                mUsbTether.setDisabledByAdmin(enforcedAdmin);

            }

        } else {

            mUsbTether.setChecked(false);

            updateUsbPreference();