Merge "Bluetooth airplane listener: Check for null" into rvc-qpr-dev

2021-03-29 18:08:21 +00:00
parent 4d7d9c5fce b68b97f2e3
commit d50ed0e726
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
@@ -127,7 +127,9 @@ class BluetoothAirplaneModeListener {
            }
            return;
        }
-        mAirplaneHelper.onAirplaneModeChanged(mBluetoothManager);
+        if (mAirplaneHelper != null) {
+            mAirplaneHelper.onAirplaneModeChanged(mBluetoothManager);
+        }
    }

    @VisibleForTesting