diff options
author | Rakesh Iyer <rni@google.com> | 2016-10-20 11:47:25 -0700 |
---|---|---|
committer | Rakesh Iyer <rni@google.com> | 2016-10-20 18:50:56 +0000 |
commit | aae6d4d45be82516f7b517e06b7c5a9c07f01a13 (patch) | |
tree | 56730a17689d2472cc19b7f7e28d4a99c2bcac6e | |
parent | 3d724a4b70dd9a08d9adddc3b403edfd572bcaa6 (diff) | |
download | platform_packages_apps_Car_Dialer-aae6d4d45be82516f7b517e06b7c5a9c07f01a13.tar.gz platform_packages_apps_Car_Dialer-aae6d4d45be82516f7b517e06b7c5a9c07f01a13.tar.bz2 platform_packages_apps_Car_Dialer-aae6d4d45be82516f7b517e06b7c5a9c07f01a13.zip |
Prevent dialer from crashing in emulator.
Bug: 32118797
Test: Manual.
Change-Id: I2427c26425f0843f2d778fa094af6022a405f09d
-rw-r--r-- | src/com/android/car/dialer/bluetooth/embedded/UiBluetoothMonitorImpl.java | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/src/com/android/car/dialer/bluetooth/embedded/UiBluetoothMonitorImpl.java b/src/com/android/car/dialer/bluetooth/embedded/UiBluetoothMonitorImpl.java index 19f047c8..2ab8bbf0 100644 --- a/src/com/android/car/dialer/bluetooth/embedded/UiBluetoothMonitorImpl.java +++ b/src/com/android/car/dialer/bluetooth/embedded/UiBluetoothMonitorImpl.java @@ -27,19 +27,30 @@ public class UiBluetoothMonitorImpl extends UiBluetoothMonitor { @Override public boolean isBluetoothEnabled() { - return getBluetoothAdapter().isEnabled(); + BluetoothAdapter adapter = getBluetoothAdapter(); + if (adapter == null) { + return false; + } + return adapter.isEnabled(); } @Override public boolean isHfpConnected() { - int hfpState = - getBluetoothAdapter().getProfileConnectionState(BluetoothProfile.HEADSET_CLIENT); + BluetoothAdapter adapter = getBluetoothAdapter(); + if (adapter == null) { + return false; + } + int hfpState = adapter.getProfileConnectionState(BluetoothProfile.HEADSET_CLIENT); return hfpState == BluetoothProfile.STATE_CONNECTED; } @Override public boolean isBluetoothPaired() { - return !getBluetoothAdapter().getBondedDevices().isEmpty(); + BluetoothAdapter adapter = getBluetoothAdapter(); + if (adapter == null) { + return false; + } + return !adapter.getBondedDevices().isEmpty(); } private BluetoothAdapter getBluetoothAdapter() { |