1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/server/BluetoothEventLoop.java b/core/java/android/server/BluetoothEventLoop.java
index b5e4090..187ec2c 100644
--- a/core/java/android/server/BluetoothEventLoop.java
+++ b/core/java/android/server/BluetoothEventLoop.java
@@ -359,10 +359,10 @@ class BluetoothEventLoop {
     private void onGetRemoteServiceChannelResult(String address, int channel) {
         IBluetoothDeviceCallback callback = mGetRemoteServiceChannelCallbacks.get(address);
         if (callback != null) {
+            mGetRemoteServiceChannelCallbacks.remove(address);
             try {
                 callback.onGetRemoteServiceChannelResult(address, channel);
             } catch (RemoteException e) {}
-            mGetRemoteServiceChannelCallbacks.remove(address);
         }
     }