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

This commit is contained in:
Alex Johnston
2022-04-27 10:21:50 +00:00
committed by Android (Google) Code Review

View File

@@ -416,8 +416,11 @@ public class TetherSettings extends RestrictedSettingsFragment
if (usbTethered) { if (usbTethered) {
mUsbTether.setEnabled(!mDataSaverEnabled); mUsbTether.setEnabled(!mDataSaverEnabled);
mUsbTether.setChecked(true); mUsbTether.setChecked(true);
mUsbTether.setDisabledByAdmin( final RestrictedLockUtils.EnforcedAdmin enforcedAdmin =
checkIfUsbDataSignalingIsDisabled(mContext, UserHandle.myUserId())); checkIfUsbDataSignalingIsDisabled(mContext, UserHandle.myUserId());
if (enforcedAdmin != null) {
mUsbTether.setDisabledByAdmin(enforcedAdmin);
}
} else { } else {
mUsbTether.setChecked(false); mUsbTether.setChecked(false);
updateUsbPreference(); updateUsbPreference();