diff options
author | Yuzhou <jiayuzhou@google.com> | 2018-06-14 18:40:02 -0700 |
---|---|---|
committer | Yuzhou <jiayuzhou@google.com> | 2018-06-14 18:42:18 -0700 |
commit | 47414b4f26a7c25ea8413d7df9194fd4a9c82699 (patch) | |
tree | ee9e11b23ccc14799bb69ee46edf58c994598cab | |
parent | 75b66ecd889ad0c1fa04b0453b7470480e70c2e9 (diff) | |
download | platform_packages_apps_Car_Dialer-pie-qpr1-s2-release.tar.gz platform_packages_apps_Car_Dialer-pie-qpr1-s2-release.tar.bz2 platform_packages_apps_Car_Dialer-pie-qpr1-s2-release.zip |
Fix NPE in UiCallManager which will happen if Bluetooth is notandroid-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-devpie-b4s4-releasepie-b4s4-dev
supported.
Test: build and load the app.
Bug: 109894902
Change-Id: I67ab9ef3bb8d9f67183c6d01e2448bec1d06e8a2
-rw-r--r-- | src/com/android/car/dialer/telecom/UiCallManager.java | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/com/android/car/dialer/telecom/UiCallManager.java b/src/com/android/car/dialer/telecom/UiCallManager.java index 0e9c2a1a..be424872 100644 --- a/src/com/android/car/dialer/telecom/UiCallManager.java +++ b/src/com/android/car/dialer/telecom/UiCallManager.java @@ -134,18 +134,20 @@ public class UiCallManager { context.bindService(intent, mInCallServiceConnection, Context.BIND_AUTO_CREATE); BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter(); - adapter.getProfileProxy(mContext, new BluetoothProfile.ServiceListener() { - @Override - public void onServiceConnected(int profile, BluetoothProfile proxy) { - if (profile == BluetoothProfile.HEADSET_CLIENT) { - mBluetoothHeadsetClient = (BluetoothHeadsetClient) proxy; + if (adapter != null) { + adapter.getProfileProxy(mContext, new BluetoothProfile.ServiceListener() { + @Override + public void onServiceConnected(int profile, BluetoothProfile proxy) { + if (profile == BluetoothProfile.HEADSET_CLIENT) { + mBluetoothHeadsetClient = (BluetoothHeadsetClient) proxy; + } } - } - @Override - public void onServiceDisconnected(int profile) { - } - }, BluetoothProfile.HEADSET_CLIENT); + @Override + public void onServiceDisconnected(int profile) { + } + }, BluetoothProfile.HEADSET_CLIENT); + } } private final ServiceConnection mInCallServiceConnection = new ServiceConnection() { |