Merge "Bluetooth airplane listener: Check for null" am: 2b7a7f8ec9 am: 38a83f01dc am: e2654876bf

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1522300 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4a788dbd9c3f57b44261a4fa3b1d575166d0274f
2020-12-11 10:56:32 +00:00
parent cf890eaf03 e2654876bf
commit 345634607e
1 changed files with 3 additions and 1 deletions
--- a/services/core/java/com/android/server/BluetoothAirplaneModeListener.java
+++ b/services/core/java/com/android/server/BluetoothAirplaneModeListener.java
@@ -119,7 +119,9 @@ class BluetoothAirplaneModeListener {
            }
            return;
        }
-        mAirplaneHelper.onAirplaneModeChanged(mBluetoothManager);
+        if (mAirplaneHelper != null) {
+            mAirplaneHelper.onAirplaneModeChanged(mBluetoothManager);
+        }
    }

    @VisibleForTesting