Automated import from //branches/donutburger/...@140890,140890

diff --git a/core/java/android/server/BluetoothEventLoop.java b/core/java/android/server/BluetoothEventLoop.java
index 6be8eb9..6eabea4 100644 (file)
--- a/core/java/android/server/BluetoothEventLoop.java
+++ b/core/java/android/server/BluetoothEventLoop.java
@@ -343,7 +343,7 @@ class BluetoothEventLoop {
 
     private void onPasskeyAgentCancel(String address) {
         address = address.toUpperCase();
-        mPasskeyAgentRequestData.remove(address);
+        mBluetoothService.cancelPin(address);
         Intent intent = new Intent(BluetoothIntent.PAIRING_CANCEL_ACTION);
         intent.putExtra(BluetoothIntent.ADDRESS, address);
         mContext.sendBroadcast(intent, BLUETOOTH_ADMIN_PERM);