From b68b97f2e31e4bdff2bdcc8f94309492b8b87ff1 Mon Sep 17 00:00:00 2001
From: Hansong Zhang <hsz@google.com>
Date: Wed, 9 Dec 2020 14:25:15 -0800
Subject: 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 b49f86605411035817a305bed6d1ef6c389c6c7b)
---
 .../core/java/com/android/server/BluetoothAirplaneModeListener.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/BluetoothAirplaneModeListener.java b/services/core/java/com/android/server/BluetoothAirplaneModeListener.java
index 31cd5d519d87..0b2cc8890922 100644
--- a/services/core/java/com/android/server/BluetoothAirplaneModeListener.java
+++ b/services/core/java/com/android/server/BluetoothAirplaneModeListener.java
@@ -127,7 +127,9 @@ class BluetoothAirplaneModeListener {
             }
             return;
         }
-        mAirplaneHelper.onAirplaneModeChanged(mBluetoothManager);
+        if (mAirplaneHelper != null) {
+            mAirplaneHelper.onAirplaneModeChanged(mBluetoothManager);
+        }
     }
 
     @VisibleForTesting
-- 
cgit v1.2.3-59-g8ed1b