commit cc68fc0edcc11e6b9e355cdbfe1a1b0193283f0b
author Pavlin Radoslavov <pavlin@google.com> Thu Sep 22 23:08:14 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 22 23:08:14 2016 +0000
tree ade42f57d368d70d7c3c81b2e30dc80c24435507
parent b62cc13c7c427b9381c9c7ffe3dcd95662698108
parent d0113aab0cb602e61cba5b1f0a6e40f8aa15419c

Merge "Removed MESSAGE_BIND_PROFILE_SERVICE messages on unbind" am: 3b0256fc73 am: 829285c38e
am: d0113aab0c

Change-Id: I369cef9da608f2175279245de8fb220e8012f3e5

services/core/java/com/android/server/BluetoothManagerService.java

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