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

Commit c98f700d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix USB tether option" into sc-dev am: 15afdd80 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16476806

Change-Id: Id7e0710939954f4dd7a89df8d09420abdc96c2c4
parents 8c799744 15afdd80

src/com/android/settings/TetherSettings.java

+6 −3
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ import com.android.settings.core.FeatureFlags; 
import com.android.settings.datausage.DataSaverBackend;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.wifi.tether.WifiTetherPreferenceController;

import com.android.settingslib.RestrictedLockUtils;

import com.android.settingslib.RestrictedSwitchPreference;

import com.android.settingslib.TetherUtil;

import com.android.settingslib.search.SearchIndexable;
@@ -425,14 +426,16 @@ public class TetherSettings extends RestrictedSettingsFragment 


    private void updateUsbPreference() {

        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);

        } else {

            mUsbTether.setEnabled(false);

        }

        mUsbTether.setDisabledByAdmin(

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

    }



    @VisibleForTesting