PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 31a07143: Merge "Don\'t throw exception on unexpected BT device addition." into honeycomb

Browse Source 
* commit '31a071432ee036c828b8df67a6d33f438d7efe5f':
  Don't throw exception on unexpected BT device addition.
This commit is contained in:
Jake Hamby
2011-01-11 13:51:26 -08:00
committed by Android Git Automerger
parent bd3468a5ba 31a071432e
commit 815df29359
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/bluetooth/BluetoothSettings.java
View File

@@ -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