From b3e7386b224e5ae5951d8ae5aa344dc53b3f01da Mon Sep 17 00:00:00 2001 From: Sam Hurst Date: Tue, 31 May 2016 10:35:17 -0700 Subject: [PATCH] Check for null pointer before use. Bug: 29044977 Change-Id: Ie20c656598eeb2e4700dc245c83e6a765e186117 (cherry picked from commit f384fbf05d000775b00f25fd78bda090afb088d0) --- .../systemui/statusbar/car/CarBatteryController.java | 4 ++++ .../statusbar/car/ConnectedDeviceSignalController.java | 10 +++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/car/CarBatteryController.java b/packages/SystemUI/src/com/android/systemui/statusbar/car/CarBatteryController.java index 244536d22ef33..497720265d7c9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/car/CarBatteryController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/car/CarBatteryController.java @@ -78,6 +78,10 @@ public class CarBatteryController extends BroadcastReceiver implements BatteryCo public CarBatteryController(Context context) { mContext = context; + if (mAdapter == null) { + return; + } + mAdapter.getProfileProxy(context.getApplicationContext(), mHfpServiceListener, BluetoothProfile.HEADSET_CLIENT); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/car/ConnectedDeviceSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/car/ConnectedDeviceSignalController.java index 30a42c2e2e42d..07856daa9d8a7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/car/ConnectedDeviceSignalController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/car/ConnectedDeviceSignalController.java @@ -69,12 +69,16 @@ public class ConnectedDeviceSignalController extends BroadcastReceiver { mNetworkSignalView = (ImageView) mSignalsView.findViewById(R.id.connected_device_network_signal); - mAdapter.getProfileProxy(context.getApplicationContext(), mHfpServiceListener, - BluetoothProfile.HEADSET_CLIENT); - TypedValue typedValue = new TypedValue(); context.getResources().getValue(R.dimen.status_bar_icon_scale_factor, typedValue, true); mIconScaleFactor = typedValue.getFloat(); + + if (mAdapter == null) { + return; + } + + mAdapter.getProfileProxy(context.getApplicationContext(), mHfpServiceListener, + BluetoothProfile.HEADSET_CLIENT); } public void startListening() {