Commit 2debb7cd authored Dec 10, 2020 by Hansong Zhang Committed by Automerger Merge Worker Dec 10, 2020

Merge "Bluetooth airplane listener: Check for null" am: 3f1384cf am: b2e8ea64

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie79caa23186d242a98edde73241e629989e8dfbd

parents f0719972 b2e8ea64

service/java/com/android/server/bluetooth/BluetoothAirplaneModeListener.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -119,8 +119,10 @@ class BluetoothAirplaneModeListener {
		}
		return;
		}
		if (mAirplaneHelper != null) {
		mAirplaneHelper.onAirplaneModeChanged(mBluetoothManager);
		}
		}

		@VisibleForTesting
		boolean shouldSkipAirplaneModeChange() {