Merge "Bluetooth airplane listener: Check for null"

2020-12-10 20:36:01 +00:00
parent 39dd3d8868 b49f866054
commit 2b7a7f8ec9
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