diff options
| author | Myles Watson <mylesgw@google.com> | 2021-03-29 18:08:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-03-29 18:08:21 +0000 |
| commit | d50ed0e726e98e6ea1cd82e5d2bd262fcf6beaee (patch) | |
| tree | 38ae88213839ce6c548ec419a16e2ab956584cd6 | |
| parent | 4d7d9c5fceb9e437674257a239d787e87dbc6920 (diff) | |
| parent | b68b97f2e31e4bdff2bdcc8f94309492b8b87ff1 (diff) | |
Merge "Bluetooth airplane listener: Check for null" into rvc-qpr-dev
| -rw-r--r-- | services/core/java/com/android/server/BluetoothAirplaneModeListener.java | 4 |
1 files changed, 3 insertions, 1 deletions
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 |