commit 47414b4f26a7c25ea8413d7df9194fd4a9c82699
author Yuzhou <jiayuzhou@google.com> Thu Jun 14 18:40:02 2018 -0700
committer Yuzhou <jiayuzhou@google.com> Thu Jun 14 18:42:18 2018 -0700
tree ee9e11b23ccc14799bb69ee46edf58c994598cab
parent 75b66ecd889ad0c1fa04b0453b7470480e70c2e9

Fix NPE in UiCallManager which will happen if Bluetooth is not
supported.

Test: build and load the app.
Bug: 109894902

Change-Id: I67ab9ef3bb8d9f67183c6d01e2448bec1d06e8a2

src/com/android/car/dialer/telecom/UiCallManager.java

diff --git a/src/com/android/car/dialer/telecom/UiCallManager.java b/src/com/android/car/dialer/telecom/UiCallManager.java
index 0e9c2a1..be42487 100644
--- a/src/com/android/car/dialer/telecom/UiCallManager.java
+++ b/src/com/android/car/dialer/telecom/UiCallManager.java
@@ -134,18 +134,20 @@
         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() {