diff options
| author | Matthew Xie <mattx@google.com> | 2011-11-17 13:10:14 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-17 13:10:14 -0800 |
| commit | 2b9af44e401d884469869a4ac0933bfa727d3135 (patch) | |
| tree | 052f7cebe46cd93bdcee3634921e542fe4243adc /core/java/android/bluetooth | |
| parent | 63b7360e9d8c6fb077bdd00c7ef08f402d5a76ba (diff) | |
| parent | 6da97a24e329851888890d4e380066037d08bcd7 (diff) | |
| download | frameworks_base-2b9af44e401d884469869a4ac0933bfa727d3135.zip frameworks_base-2b9af44e401d884469869a4ac0933bfa727d3135.tar.gz frameworks_base-2b9af44e401d884469869a4ac0933bfa727d3135.tar.bz2 | |
am 6da97a24: Merge "Check the bluetooth state for getUuid call" into ics-mr0
* commit '6da97a24e329851888890d4e380066037d08bcd7':
Check the bluetooth state for getUuid call
Diffstat (limited to 'core/java/android/bluetooth')
| -rw-r--r-- | core/java/android/bluetooth/BluetoothAdapter.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java index ea5c3db..d971652 100644 --- a/core/java/android/bluetooth/BluetoothAdapter.java +++ b/core/java/android/bluetooth/BluetoothAdapter.java @@ -533,6 +533,7 @@ public final class BluetoothAdapter { * @hide */ public ParcelUuid[] getUuids() { + if (getState() != STATE_ON) return null; try { return mService.getUuids(); } catch (RemoteException e) {Log.e(TAG, "", e);} |