From a322045d92786dd3d96963a198522f7994a548a9 Mon Sep 17 00:00:00 2001
From: Michael Chan <>
Date: Fri, 27 Mar 2009 11:53:26 -0700
Subject: [PATCH] AI 143116: Added separate error messages for Bluetooth
 bonding rejections   and bonding failures due to down devices   BUG=1308546

Automated import of CL 143116
---
 res/values/strings.xml                        |  4 ++++
 .../LocalBluetoothDeviceManager.java          | 20 +++++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index b126ec13e8a..7df151c602f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -491,6 +491,10 @@
     <string name="bluetooth_pairing_error_message">There was a problem pairing with <xliff:g id="device_name">%1$s</xliff:g>.</string> 
     <!-- Message for the error dialog when BT pairing fails because the PIN entered is incorrect. -->
     <string name="bluetooth_pairing_pin_error_message">There was a problem pairing with <xliff:g id="device_name">%1$s</xliff:g> because the typed PIN is incorrect.</string> 
+    <!-- Message for the error dialog when BT pairing fails because the other device is down. -->
+    <string name="bluetooth_pairing_device_down_error_message">Cannot establish communication with <xliff:g id="device_name">%1$s</xliff:g>.</string>
+    <!-- Message for the error dialog when BT pairing fails because the other device rejected the pairing. -->
+    <string name="bluetooth_pairing_rejected_error_message">Pairing rejected by <xliff:g id="device_name">%1$s</xliff:g>.</string>
 
     <!-- Message for the error dialog when BT connecting operation fails generically. -->
     <string name="bluetooth_connecting_error_message">There was a problem connecting to <xliff:g id="device_name">%1$s</xliff:g>.</string> 
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothDeviceManager.java b/src/com/android/settings/bluetooth/LocalBluetoothDeviceManager.java
index 9527980b5a5..9e46b4d3094 100644
--- a/src/com/android/settings/bluetooth/LocalBluetoothDeviceManager.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothDeviceManager.java
@@ -181,10 +181,22 @@ public class LocalBluetoothDeviceManager {
      *            BluetoothDevice.UNBOND_REASON_*
      */
     public synchronized void onBondingError(String address, int reason) {
-        mLocalManager.showError(address, R.string.bluetooth_error_title,
-                (reason == BluetoothDevice.UNBOND_REASON_AUTH_FAILED) ?
-                        R.string.bluetooth_pairing_pin_error_message :
-                        R.string.bluetooth_pairing_error_message);
+        int errorMsg;
+
+        switch(reason) {
+        case BluetoothDevice.UNBOND_REASON_AUTH_FAILED:
+            errorMsg = R.string.bluetooth_pairing_pin_error_message;
+            break;
+        case BluetoothDevice.UNBOND_REASON_AUTH_REJECTED:
+            errorMsg = R.string.bluetooth_pairing_rejected_error_message;
+            break;
+        case BluetoothDevice.UNBOND_REASON_REMOTE_DEVICE_DOWN:
+            errorMsg = R.string.bluetooth_pairing_device_down_error_message;
+            break;
+        default:
+            errorMsg = R.string.bluetooth_pairing_error_message;
+        }
+        mLocalManager.showError(address, R.string.bluetooth_error_title, errorMsg);
     }
     
     public synchronized void onProfileStateChanged(String address, boolean transientState) {