diff options
| author | Matthew Xie <mattx@google.com> | 2011-11-16 15:31:03 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-16 15:31:03 -0800 |
| commit | 6da97a24e329851888890d4e380066037d08bcd7 (patch) | |
| tree | 69f2bf3cfed7b1afd993252206898221cf94fb73 /core/java/android/bluetooth/BluetoothAdapter.java | |
| parent | d28bb28e080f1dcd27f5b4f8b697d77cac09495b (diff) | |
| parent | 44b58ab89e59b3d8241901232c8f7dc9617b206e (diff) | |
| download | frameworks_base-6da97a24e329851888890d4e380066037d08bcd7.zip frameworks_base-6da97a24e329851888890d4e380066037d08bcd7.tar.gz frameworks_base-6da97a24e329851888890d4e380066037d08bcd7.tar.bz2 | |
Merge "Check the bluetooth state for getUuid call" into ics-mr0
Diffstat (limited to 'core/java/android/bluetooth/BluetoothAdapter.java')
| -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);} |