commit 31a071432ee036c828b8df67a6d33f438d7efe5f
author Jake Hamby <jhamby@google.com> Tue Jan 11 13:49:17 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 11 13:49:17 2011 -0800
tree a222105d6494915ec8a71e430ea735a1f153164a
parent dc4926db23fb039a024211dafd86939e9f441901
parent c6e1b293a7cca6804a0a3ea4923beea16bd6dc0e

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

src/com/android/settings/bluetooth/BluetoothSettings.java

diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index aa5decb..54f9fb1 100644
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -286,7 +286,8 @@
     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