commit e241cd6f340fedb82e1aa76d35bbcbca31fe423c
author Yorke Lee <yorkelee@google.com> Thu Oct 09 13:41:19 2014 -0700
committer Yorke Lee <yorkelee@google.com> Thu Oct 09 13:41:19 2014 -0700
tree 10c4804db0843fe1797e0e3470be80ab4a6b4c3b
parent fae0efd9745da43764b527ea130ef1bf7c362811

Protect against null mBluetoothHeadset

Bug: 17922576
Change-Id: I96a9e3005c4e6ac5c97bc5e4f11527f87d9d5e38

src/com/android/server/telecom/BluetoothPhoneService.java

diff --git a/src/com/android/server/telecom/BluetoothPhoneService.java b/src/com/android/server/telecom/BluetoothPhoneService.java
index ad6d490..443e7c3 100644
--- a/src/com/android/server/telecom/BluetoothPhoneService.java
+++ b/src/com/android/server/telecom/BluetoothPhoneService.java
@@ -581,13 +581,18 @@
                     index, direction, state, isPartOfConference, Log.piiHandle(address),
                     addressType);
         }
-        mBluetoothHeadset.clccResponse(
-                index, direction, state, 0, isPartOfConference, address, addressType);
+
+        if (mBluetoothHeadset != null) {
+            mBluetoothHeadset.clccResponse(
+                    index, direction, state, 0, isPartOfConference, address, addressType);
+        }
     }
 
     private void sendClccEndMarker() {
         // End marker is recognized with an index value of 0. All other parameters are ignored.
-        mBluetoothHeadset.clccResponse(0 /* index */, 0, 0, 0, false, null, 0);
+        if (mBluetoothHeadset != null) {
+            mBluetoothHeadset.clccResponse(0 /* index */, 0, 0, 0, false, null, 0);
+        }
     }
 
     /**