From c7dda10ee987377053781bf809e68c15e513cab0 Mon Sep 17 00:00:00 2001
From: Pavlin Radoslavov <pavlin@google.com>
Date: Wed, 21 Sep 2016 17:28:11 -0700
Subject: [PATCH] Removed MESSAGE_BIND_PROFILE_SERVICE messages on unbind

Add a missing call to remove all MESSAGE_BIND_PROFILE_SERVICE
message when unbinding and finishing.

Bug: 31442739
Test: manual, and "frameworks/base/core/tests/bluetoothtests" unit tests
Change-Id: I7e9a8f79a38d4eb8ab8b53be04650226fc72732e
(cherry picked from commit 2bbe13ebccb163c03fd6e74c4450dfd3a43b3984)
---
 .../core/java/com/android/server/BluetoothManagerService.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/core/java/com/android/server/BluetoothManagerService.java b/services/core/java/com/android/server/BluetoothManagerService.java
index 89fdfaf30559d..0f8db2e656594 100644
--- a/services/core/java/com/android/server/BluetoothManagerService.java
+++ b/services/core/java/com/android/server/BluetoothManagerService.java
@@ -707,6 +707,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
             if (mUnbinding) return;
             mUnbinding = true;
             mHandler.removeMessages(MESSAGE_BLUETOOTH_STATE_CHANGE);
+            mHandler.removeMessages(MESSAGE_BIND_PROFILE_SERVICE);
             if (mBluetooth != null) {
                 //Unregister callback object
                 try {