Merge "Don't throw exception on unexpected BT device addition." into honeycomb

2011-01-11 13:49:17 -08:00
parent dc4926db23 c6e1b293a7
commit 31a071432e
1 changed files with 2 additions and 1 deletions
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -286,7 +286,8 @@ public class BluetoothSettings extends SettingsPreferenceFragment
    public void onDeviceAdded(CachedBluetoothDevice cachedDevice) {

        if (mDevicePreferenceMap.get(cachedDevice) != null) {
-            throw new IllegalStateException("Got onDeviceAdded, but cachedDevice already exists");
+            Log.e(TAG, "Got onDeviceAdded, but cachedDevice already exists");
+            return;
        }

        if (mScreenType != SCREEN_TYPE_SETTINGS