commit 7e77a4908687ed711c08420cd565216c92a41ecb
author Treehugger Robot <treehugger-gerrit@google.com> Wed Oct 03 18:04:28 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 03 18:04:28 2018 +0000
tree a166955a3982cffdd078209b6f142a5fb20af119
parent b9590c6aae5a486cdc93f04e5ab2131e8b2995d0
parent fa18829c72d26c98b677b813b94534ce634bd2ac

Merge "Add SapProfile to LocalBluetoothProfileManager (2/2)"

src/com/android/bluetooth/sap/SapService.java

diff --git a/src/com/android/bluetooth/sap/SapService.java b/src/com/android/bluetooth/sap/SapService.java
index 66e0b19..00eeca7 100644
--- a/src/com/android/bluetooth/sap/SapService.java
+++ b/src/com/android/bluetooth/sap/SapService.java
@@ -539,7 +539,7 @@
     public boolean disconnect(BluetoothDevice device) {
         boolean result = false;
         synchronized (SapService.this) {
-            if (getRemoteDevice().equals(device)) {
+            if (mRemoteDevice != null && mRemoteDevice.equals(device)) {
                 switch (mState) {
                     case BluetoothSap.STATE_CONNECTED:
                         closeConnectionSocket();