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

[Catalyst] Partially revert ag/30664694

Browse Source 
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
This commit is contained in:
Jacky Wang
2024-12-11 16:22:49 +08:00
parent 810309413a
commit dc80bddc1e
1 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/com/android/settings/network/tether/TetherSettings.java
View File

@@ -72,7 +72,6 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
// LINT.IfChange
/** /**
* Displays preferences for Tethering. * Displays preferences for Tethering.
*/ */
@@ -209,19 +208,16 @@ public class TetherSettings extends RestrictedDashboardFragment
mWifiTetherPreferenceController.displayPreference(getPreferenceScreen()); mWifiTetherPreferenceController.displayPreference(getPreferenceScreen());
} }
if (!isCatalystEnabled()) { if (!bluetoothAvailable) {
if (!bluetoothAvailable) { getPreferenceScreen().removePreference(mBluetoothTether);
mBluetoothTether.setVisible(false); } else {
BluetoothPan pan = mBluetoothPan.get();
if (pan != null && pan.isTetheringOn()) {
mBluetoothTether.setChecked(true);
} else { } else {
BluetoothPan pan = mBluetoothPan.get(); mBluetoothTether.setChecked(false);
if (pan != null && pan.isTetheringOn()) {
mBluetoothTether.setChecked(true);
} else {
mBluetoothTether.setChecked(false);
}
} }
} }
if (!ethernetAvailable) getPreferenceScreen().removePreference(mEthernetTether); if (!ethernetAvailable) getPreferenceScreen().removePreference(mEthernetTether);
// Set initial state based on Data Saver mode. // Set initial state based on Data Saver mode.
onDataSaverChanged(mDataSaverBackend.isDataSaverEnabled()); onDataSaverChanged(mDataSaverBackend.isDataSaverEnabled());
@@ -274,9 +270,7 @@ public class TetherSettings extends RestrictedDashboardFragment
mWifiTetherPreferenceController.setDataSaverEnabled(mDataSaverEnabled); mWifiTetherPreferenceController.setDataSaverEnabled(mDataSaverEnabled);
} }
mUsbTether.setEnabled(!mDataSaverEnabled); mUsbTether.setEnabled(!mDataSaverEnabled);
if (!isCatalystEnabled()) { mBluetoothTether.setEnabled(!mDataSaverEnabled);
mBluetoothTether.setEnabled(!mDataSaverEnabled);
}
mEthernetTether.setEnabled(!mDataSaverEnabled); mEthernetTether.setEnabled(!mDataSaverEnabled);
mDataSaverFooter.setVisible(mDataSaverEnabled); mDataSaverFooter.setVisible(mDataSaverEnabled);
} }
@@ -526,8 +520,6 @@ public class TetherSettings extends RestrictedDashboardFragment
} }
private void updateBluetoothState() { private void updateBluetoothState() {
if (isCatalystEnabled()) return;
final int btState = getBluetoothState(); final int btState = getBluetoothState();
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "updateBluetoothState() btState : " + btState); Log.d(TAG, "updateBluetoothState() btState : " + btState);
@@ -583,7 +575,7 @@ public class TetherSettings extends RestrictedDashboardFragment
} }
private void startTethering(int choice) { private void startTethering(int choice) {
if (choice == TETHERING_BLUETOOTH && !isCatalystEnabled()) { if (choice == TETHERING_BLUETOOTH) {
// Turn on Bluetooth first. // Turn on Bluetooth first.
BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter(); BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
if (adapter.getState() == BluetoothAdapter.STATE_OFF) { if (adapter.getState() == BluetoothAdapter.STATE_OFF) {
@@ -605,7 +597,7 @@ public class TetherSettings extends RestrictedDashboardFragment
} else { } else {
mCm.stopTethering(TETHERING_USB); mCm.stopTethering(TETHERING_USB);
} }
} else if (preference == mBluetoothTether && !isCatalystEnabled()) { } else if (preference == mBluetoothTether) {
if (mBluetoothTether.isChecked()) { if (mBluetoothTether.isChecked()) {
startTethering(TETHERING_BLUETOOTH); startTethering(TETHERING_BLUETOOTH);
} else { } else {
@@ -753,4 +745,3 @@ public class TetherSettings extends RestrictedDashboardFragment
return TetherScreen.KEY; return TetherScreen.KEY;
} }
} }
// LINT.ThenChange(BluetoothTetherSwitchPreference.kt)