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

Merge "Fix Bluetooth tethering toggle status" into udc-dev am: 74e1412f8e

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

Change-Id: I741fa8c4179c8d6f962b97a5a9146baf08a44cff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chaohui Wang
2023-05-12 14:08:47 +00:00
committed by Automerger Merge Worker
parent e9091d1d7c 74e1412f8e
commit 8badf64092
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -171,6 +171,8 @@ public class TetherSettings extends RestrictedSettingsFragment
return; return;
} }
setupTetherPreference();
final Activity activity = getActivity(); final Activity activity = getActivity();
BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter(); BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
if (adapter != null) { if (adapter != null) {
@@ -184,7 +186,6 @@ public class TetherSettings extends RestrictedSettingsFragment
new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED)); new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED));
} }
setupTetherPreference();
setTopIntroPreferenceTitle(); setTopIntroPreferenceTitle();
mDataSaverBackend.addListener(this); mDataSaverBackend.addListener(this);
@@ -605,6 +606,7 @@ public class TetherSettings extends RestrictedSettingsFragment
public void onServiceConnected(int profile, BluetoothProfile proxy) { public void onServiceConnected(int profile, BluetoothProfile proxy) {
if (mBluetoothPan.get() == null) { if (mBluetoothPan.get() == null) {
mBluetoothPan.set((BluetoothPan) proxy); mBluetoothPan.set((BluetoothPan) proxy);
updateBluetoothState();
} }
} }