PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix USB tether option" into sc-qpr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-09-30 12:06:41 +00:00
committed by Android (Google) Code Review
parent bdbca48e77 685cacb540
commit 7ba545d992
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/TetherSettings.java
View File

@@ -55,6 +55,7 @@ import com.android.settings.core.FeatureFlags;
import com.android.settings.datausage.DataSaverBackend; import com.android.settings.datausage.DataSaverBackend;
import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.wifi.tether.WifiTetherPreferenceController; import com.android.settings.wifi.tether.WifiTetherPreferenceController;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedSwitchPreference; import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.TetherUtil; import com.android.settingslib.TetherUtil;
import com.android.settingslib.search.SearchIndexable; import com.android.settingslib.search.SearchIndexable;
@@ -425,14 +426,16 @@ public class TetherSettings extends RestrictedSettingsFragment
private void updateUsbPreference() { private void updateUsbPreference() {
boolean usbAvailable = mUsbConnected && !mMassStorageActive; boolean usbAvailable = mUsbConnected && !mMassStorageActive;
final RestrictedLockUtils.EnforcedAdmin enforcedAdmin =
checkIfUsbDataSignalingIsDisabled(mContext, UserHandle.myUserId());
if (usbAvailable) { if (enforcedAdmin != null) {
mUsbTether.setDisabledByAdmin(enforcedAdmin);
} else if (usbAvailable) {
mUsbTether.setEnabled(!mDataSaverEnabled); mUsbTether.setEnabled(!mDataSaverEnabled);
} else { } else {
mUsbTether.setEnabled(false); mUsbTether.setEnabled(false);
} }
mUsbTether.setDisabledByAdmin(
checkIfUsbDataSignalingIsDisabled(mContext, UserHandle.myUserId()));
} }
@VisibleForTesting @VisibleForTesting