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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1522300

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie79caa23186d242a98edde73241e629989e8dfbd
This commit is contained in:
Hansong Zhang
2020-12-10 21:07:20 +00:00
committed by Automerger Merge Worker

View File

@@ -119,7 +119,9 @@ class BluetoothAirplaneModeListener {
} }
return; return;
} }
mAirplaneHelper.onAirplaneModeChanged(mBluetoothManager); if (mAirplaneHelper != null) {
mAirplaneHelper.onAirplaneModeChanged(mBluetoothManager);
}
} }
@VisibleForTesting @VisibleForTesting