diff options
| author | Nick Pelly <> | 2009-03-31 14:56:27 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-31 14:56:27 -0700 |
| commit | b20dd917e2d29045225985baa980a2a8e22e10fc (patch) | |
| tree | 83c6c8b9014d62058e0d347e8365dba610053383 /src/com/android/settings/bluetooth | |
| parent | 6e811f2209e0aba4fe4ba4cdef5b74f1a1f74a23 (diff) | |
| download | packages_apps_settings-b20dd917e2d29045225985baa980a2a8e22e10fc.zip packages_apps_settings-b20dd917e2d29045225985baa980a2a8e22e10fc.tar.gz packages_apps_settings-b20dd917e2d29045225985baa980a2a8e22e10fc.tar.bz2 | |
AI 143788: am: CL 143740 Don't clear supported profiles in settings app if getRemoteClass returns error.
Also clean up the error codes returned by the framework, so that the settings app can properly detect an error.
Original author: npelly
Merged from: //branches/cupcake/...
Automated import of CL 143788
Diffstat (limited to 'src/com/android/settings/bluetooth')
| -rw-r--r-- | src/com/android/settings/bluetooth/LocalBluetoothDevice.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothDevice.java b/src/com/android/settings/bluetooth/LocalBluetoothDevice.java index 199a422..86b1d69 100644 --- a/src/com/android/settings/bluetooth/LocalBluetoothDevice.java +++ b/src/com/android/settings/bluetooth/LocalBluetoothDevice.java @@ -575,8 +575,9 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> { */ private void fetchBtClass() { mBtClass = mLocalManager.getBluetoothManager().getRemoteClass(mAddress); - mProfiles.clear(); - LocalBluetoothProfileManager.fill(mBtClass, mProfiles); + if (mBtClass != BluetoothClass.ERROR) { + LocalBluetoothProfileManager.fill(mBtClass, mProfiles); + } } /** |