diff options
| author | Hansong Zhang <hsz@google.com> | 2020-12-09 14:25:15 -0800 |
|---|---|---|
| committer | Myles Watson <mylesgw@google.com> | 2021-03-25 14:48:39 -0700 |
| commit | d7da98e70a62da10b6f20ea9cbadb788cd28f9d5 (patch) | |
| tree | 9542d510aef77ebbceaf64a0cc5efb6c32ea3a2e | |
| parent | ff82368c84623a778a898525f63f55f894f24598 (diff) | |
Bluetooth airplane listener: Check for null
Check mAirplaneHelper != null before accessing it. Note that this can
be null if Settings.Global.RADIO_BLUETOOTH is enabled in
AIRPLANE_MODE_RADIOS. We don't need to disable Bluetooth if it's
allowed in airplane mode.
Test: atest FrameworksServicesTests
Bug: 174254527
Change-Id: I93ae4ec6b75b7ffb8e75848d7779ab64593221bd
(cherry picked from commit a107eae7e921aa56d271bc531dbc11d55b4abd0b)
| -rw-r--r-- | service/java/com/android/server/bluetooth/BluetoothAirplaneModeListener.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/service/java/com/android/server/bluetooth/BluetoothAirplaneModeListener.java b/service/java/com/android/server/bluetooth/BluetoothAirplaneModeListener.java index 31cd5d519d..0b2cc88909 100644 --- a/service/java/com/android/server/bluetooth/BluetoothAirplaneModeListener.java +++ b/service/java/com/android/server/bluetooth/BluetoothAirplaneModeListener.java @@ -127,7 +127,9 @@ class BluetoothAirplaneModeListener { } return; } - mAirplaneHelper.onAirplaneModeChanged(mBluetoothManager); + if (mAirplaneHelper != null) { + mAirplaneHelper.onAirplaneModeChanged(mBluetoothManager); + } } @VisibleForTesting |