diff options
| author | Himanshu Rawat <rwt@google.com> | 2021-12-10 08:14:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-10 08:14:36 +0000 |
| commit | fcfa8b53454b7f745611bc53750e2f4a8914295c (patch) | |
| tree | 37b24acb7e911579458d7d2957d8d015a4d1aff7 | |
| parent | c7b4a75b306fd9deff54ca0081f66e430611505d (diff) | |
| parent | 2a1dc3a8e9e556ba89746d5d11063eadac83971d (diff) | |
| download | base-fcfa8b53454b7f745611bc53750e2f4a8914295c.tar.gz | |
Merge "Corrected comment on when BT is not disabled on entering airplane mode." am: 2a1dc3a8e9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1916077
Change-Id: Ia8b880bf0220f915214ce98b3d55e04d65bf416a
| -rw-r--r-- | services/core/java/com/android/server/BluetoothAirplaneModeListener.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/BluetoothAirplaneModeListener.java b/services/core/java/com/android/server/BluetoothAirplaneModeListener.java index 263ff189a288..380b1f37b981 100644 --- a/services/core/java/com/android/server/BluetoothAirplaneModeListener.java +++ b/services/core/java/com/android/server/BluetoothAirplaneModeListener.java @@ -112,9 +112,9 @@ class BluetoothAirplaneModeListener { void handleAirplaneModeChange() { if (shouldSkipAirplaneModeChange()) { Log.i(TAG, "Ignore airplane mode change"); - // We have to store Bluetooth state here, so if user turns off Bluetooth - // after airplane mode is turned on, we don't forget to turn on Bluetooth - // when airplane mode turns off. + // Airplane mode enabled when Bluetooth is being used for audio/headering aid. + // Bluetooth is not disabled in such case, only state is changed to + // BLUETOOTH_ON_AIRPLANE mode. mAirplaneHelper.setSettingsInt(Settings.Global.BLUETOOTH_ON, BluetoothManagerService.BLUETOOTH_ON_AIRPLANE); if (shouldPopToast()) { |