commit a107eae7e921aa56d271bc531dbc11d55b4abd0b
author Hansong Zhang <hsz@google.com> Wed Dec 09 14:25:15 2020 -0800
committer Hansong Zhang <hsz@google.com> Thu Dec 10 20:35:50 2020 +0000
tree 5c0200877d6b05c8e9ea88521aaca857d174530b
parent 390e3df5db2bc563944dc518b4507bbc37b578d6

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

service/java/com/android/server/bluetooth/BluetoothAirplaneModeListener.java

diff --git a/service/java/com/android/server/bluetooth/BluetoothAirplaneModeListener.java b/service/java/com/android/server/bluetooth/BluetoothAirplaneModeListener.java
index 4d9680c..aa56da5 100644
--- a/service/java/com/android/server/bluetooth/BluetoothAirplaneModeListener.java
+++ b/service/java/com/android/server/bluetooth/BluetoothAirplaneModeListener.java
@@ -119,7 +119,9 @@
             }
             return;
         }
-        mAirplaneHelper.onAirplaneModeChanged(mBluetoothManager);
+        if (mAirplaneHelper != null) {
+            mAirplaneHelper.onAirplaneModeChanged(mBluetoothManager);
+        }
     }
 
     @VisibleForTesting