commit f53904d617cfba99662175a2d9307c30e435c5c8
author Joseph Pirozzo <pirozzoj@google.com> Tue Oct 29 20:52:35 2019 -0700
committer Joseph Pirozzo <pirozzoj@google.com> Mon Mar 16 19:05:14 2020 +0000
tree 13a04730565c069d707286f71b52a4aff9660b35
parent 362108ec36150b8556892d2786f5c16b97051fd4

MAP Client close connection on MNS disconnect

If the MNS connection is terminated from the client side disconnect the
corresponding MAS client.

Bug: 129908795
Test: disconnect the MAP connection from the MAS server (MNS client)
Change-Id: I39b524b2222d47a553eeaa4b9781f3200443cf8e
(cherry picked from commit ec407574bee6c1cff4228daed8b413a82ff509b3)

Merged-In: I39b524b2222d47a553eeaa4b9781f3200443cf8e
Change-Id: I71426bef61234d1f1c61dfe94f23c266ea8e8a34

src/com/android/bluetooth/mapclient/MnsObexServer.java

diff --git a/src/com/android/bluetooth/mapclient/MnsObexServer.java b/src/com/android/bluetooth/mapclient/MnsObexServer.java
index 53cd79b..33ba1ea 100644
--- a/src/com/android/bluetooth/mapclient/MnsObexServer.java
+++ b/src/com/android/bluetooth/mapclient/MnsObexServer.java
@@ -90,6 +90,10 @@
         if (VDBG) {
             Log.v(TAG, "onDisconnect");
         }
+        MceStateMachine currentStateMachine = mStateMachineReference.get();
+        if (currentStateMachine != null) {
+            currentStateMachine.disconnect();
+        }
     }
 
     @Override