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

Commit 829122e7 authored by Dan Elkouby's avatar Dan Elkouby
Browse files

Revert "Open WiFi network when pull out the USB line." 

This reverts commit adce6ee6.
- Tethering from WiFi to USB is a perfectly legit use case, nuke that
  shit.
- That extra xml key + check is useless and breaks USB tethering
  entirely unless added to the overlay.

Change-Id: I8c1c5d267a16df310f944234235234076787cd03
parent e7a578e9

res/values/config.xml

+0 −6
Original line number Diff line number Diff line
@@ -56,10 +56,6 @@ 
    <!-- show tethering help begin -->

    <bool name="tethering_show_help_for_first_using">false</bool>

    <bool name="tethering_show_help_menu">false</bool>



    <!-- Config to enable/disable the USB line-->

    <bool name="config_usb_line_enable">false</bool>



    <!-- show tethering help end -->

    <!-- Config voice over lte in wireless settings begin -->

    <bool name="config_voice_over_lte_enabled">false</bool>
@@ -72,8 +68,6 @@ 


    <bool name="config_regional_usb_tethering_quick_start_enable">false</bool>

    <bool name="config_regional_hotspot_tether_help_enable">false</bool>

    <!-- Config to enable/disable the USB line-->

    <bool name="config_usb_line_enable">false</bool>

    <bool name="config_show_dialog_open_wifi_when_tethering_open">false</bool>

    <bool name="config_regional_account_check_dialog_enable">false</bool>

    <!-- Tethering & Mobile HotSpots display summary on Tmoblie -->

src/com/android/settings/TetherSettings.java

+1 −27
Original line number Diff line number Diff line
@@ -150,10 +150,6 @@ public class TetherSettings extends RestrictedSettingsFragment 
    private DataSaverBackend mDataSaverBackend;

    private boolean mDataSaverEnabled;

    private Preference mDataSaverFooter;

    /* Record the wifi status before usb tether is on */

    private boolean mUsbEnable = false;

    private WifiManager mWifiStatusManager;

    private boolean mIsWifiEnabled = false;



    @Override

    protected int getMetricsCategory() {
@@ -272,9 +268,6 @@ public class TetherSettings extends RestrictedSettingsFragment 
        }

        // Set initial state based on Data Saver mode.

        onDataSaverChanged(mDataSaverBackend.isDataSaverEnabled());

        mUsbEnable = getResources().getBoolean(R.bool.config_usb_line_enable);

        mWifiStatusManager= (WifiManager) getActivity().getSystemService(

                Context.WIFI_SERVICE);

    }



    @Override
@@ -371,12 +364,6 @@ public class TetherSettings extends RestrictedSettingsFragment 
                updateState();

            } else if (action.equals(UsbManager.ACTION_USB_STATE)) {

                mUsbConnected = intent.getBooleanExtra(UsbManager.USB_CONNECTED, false);

                mMassStorageActive = Environment.MEDIA_SHARED.equals(

                        Environment.getExternalStorageState());

                boolean usbAvailable = mUsbConnected && !mMassStorageActive;

                if(!usbAvailable && mIsWifiEnabled && mUsbEnable){

                    mWifiManager.setWifiEnabled(true);

                }

                updateState();

            } else if (action.equals(BluetoothAdapter.ACTION_STATE_CHANGED)) {

                if (mBluetoothEnableForTether) {
@@ -700,29 +687,16 @@ public class TetherSettings extends RestrictedSettingsFragment 
            }

        }



        if (choice == TETHERING_USB) {

            if(mUsbTether.isChecked()) {

                mWifiManager.setWifiEnabled(false);

            }

        }

        mCm.startTethering(choice, true, mStartTetheringCallback, mHandler);

    }



    @Override

    public boolean onPreferenceTreeClick(Preference preference) {

        if (preference == mUsbTether) {

            if (mUsbTether.isChecked() && mUsbEnable) {

            //get the wifi status

            mIsWifiEnabled = mWifiStatusManager.isWifiEnabled();

            IntentFilter filter = new IntentFilter();

            filter.addAction(UsbManager.ACTION_USB_STATE);

            getActivity().registerReceiver(mTetherChangeReceiver, filter);

            if (mUsbTether.isChecked()) {

                startTethering(TETHERING_USB);

            } else {

                mCm.stopTethering(TETHERING_USB);

                if (mIsWifiEnabled) {

                    mWifiManager.setWifiEnabled(true);

                }

            }

        } else if (preference == mBluetoothTether) {

            if (mBluetoothTether.isChecked()) {