summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Himanshu Rawat <rwt@google.com> 2021-12-10 07:57:09 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2021-12-10 07:57:09 +0000
commit2a1dc3a8e9e556ba89746d5d11063eadac83971d (patch)
treea40f046350758ffc7cd626dca663b7d4750fe422
parent610b5855026138e198a04e47efff0652231477b2 (diff)
parent8825d9aa27e3c82094ca347103993c1090125a26 (diff)
Merge "Corrected comment on when BT is not disabled on entering airplane mode."
-rw-r--r--services/core/java/com/android/server/BluetoothAirplaneModeListener.java6
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()) {