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

Commit dc80bddc authored by Jacky Wang's avatar Jacky Wang
Browse files

[Catalyst] Partially revert ag/30664694 

The preference is not yet migrated, we should not update fragment based
on current flag rollout plan.

Bug: 368355361
Bug: 368359963
Flag: com.android.settings.flags.catalyst_tether_settings
Test: manual
Change-Id: I89a5d2ee29e1c3428d40428b3d3d4ba3afcd4ece
parent 81030941

src/com/android/settings/network/tether/TetherSettings.java

+10 −19
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ import java.util.HashSet; 
import java.util.List;

import java.util.concurrent.atomic.AtomicReference;



// LINT.IfChange

/**

 * Displays preferences for Tethering.

 */
@@ -209,9 +208,8 @@ public class TetherSettings extends RestrictedDashboardFragment 
            mWifiTetherPreferenceController.displayPreference(getPreferenceScreen());

        }



        if (!isCatalystEnabled()) {

        if (!bluetoothAvailable) {

                mBluetoothTether.setVisible(false);

            getPreferenceScreen().removePreference(mBluetoothTether);

        } else {

            BluetoothPan pan = mBluetoothPan.get();

            if (pan != null && pan.isTetheringOn()) {
@@ -220,8 +218,6 @@ public class TetherSettings extends RestrictedDashboardFragment 
                mBluetoothTether.setChecked(false);

            }

        }

        }



        if (!ethernetAvailable) getPreferenceScreen().removePreference(mEthernetTether);

        // Set initial state based on Data Saver mode.

        onDataSaverChanged(mDataSaverBackend.isDataSaverEnabled());
@@ -274,9 +270,7 @@ public class TetherSettings extends RestrictedDashboardFragment 
            mWifiTetherPreferenceController.setDataSaverEnabled(mDataSaverEnabled);

        }

        mUsbTether.setEnabled(!mDataSaverEnabled);

        if (!isCatalystEnabled()) {

        mBluetoothTether.setEnabled(!mDataSaverEnabled);

        }

        mEthernetTether.setEnabled(!mDataSaverEnabled);

        mDataSaverFooter.setVisible(mDataSaverEnabled);

    }
@@ -526,8 +520,6 @@ public class TetherSettings extends RestrictedDashboardFragment 
    }



    private void updateBluetoothState() {

        if (isCatalystEnabled()) return;



        final int btState = getBluetoothState();

        if (DEBUG) {

            Log.d(TAG, "updateBluetoothState() btState : " + btState);
@@ -583,7 +575,7 @@ public class TetherSettings extends RestrictedDashboardFragment 
    }



    private void startTethering(int choice) {

        if (choice == TETHERING_BLUETOOTH && !isCatalystEnabled()) {

        if (choice == TETHERING_BLUETOOTH) {

            // Turn on Bluetooth first.

            BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();

            if (adapter.getState() == BluetoothAdapter.STATE_OFF) {
@@ -605,7 +597,7 @@ public class TetherSettings extends RestrictedDashboardFragment 
            } else {

                mCm.stopTethering(TETHERING_USB);

            }

        } else if (preference == mBluetoothTether && !isCatalystEnabled()) {

        } else if (preference == mBluetoothTether) {

            if (mBluetoothTether.isChecked()) {

                startTethering(TETHERING_BLUETOOTH);

            } else {
@@ -753,4 +745,3 @@ public class TetherSettings extends RestrictedDashboardFragment 
        return TetherScreen.KEY;

    }

}
 
// LINT.ThenChange(BluetoothTetherSwitchPreference.kt)