diff options
| author | Hansong Zhang <hsz@google.com> | 2020-12-10 20:36:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-12-10 20:36:01 +0000 |
| commit | 2b7a7f8ec93d030992ee1b3f12dc94068e0f876b (patch) | |
| tree | 8202475076df6605480cf332997cc28d2c75054f | |
| parent | 39dd3d8868792fe69ed80aaefa03b26e3491abf6 (diff) | |
| parent | b49f86605411035817a305bed6d1ef6c389c6c7b (diff) | |
Merge "Bluetooth airplane listener: Check for null"
| -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 4d9680c785bc..aa56da5773e9 100644 --- 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 |