diff options
| author | Zhihai Xu <zhihaixu@google.com> | 2014-01-14 06:47:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-01-14 06:47:06 +0000 |
| commit | 9efa3b6c6349c1eede54f7a0af77eb450ae78c76 (patch) | |
| tree | b73b7e8a64cba5b1a12f54bb0031bfb307f97cff /core/java/android/bluetooth/BluetoothDevice.java | |
| parent | 1bca21ced08e2987c1e5209d9a09a11c49745b51 (diff) | |
| parent | 5d04f1c9d9390579c9205d2faf09b954cbcc1aea (diff) | |
| download | frameworks_base-9efa3b6c6349c1eede54f7a0af77eb450ae78c76.zip frameworks_base-9efa3b6c6349c1eede54f7a0af77eb450ae78c76.tar.gz frameworks_base-9efa3b6c6349c1eede54f7a0af77eb450ae78c76.tar.bz2 | |
Merge "NPE in BluetoothDevice.fetchUuidsWithSdp"
Diffstat (limited to 'core/java/android/bluetooth/BluetoothDevice.java')
| -rw-r--r-- | core/java/android/bluetooth/BluetoothDevice.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java index 1bd698d..a396a05 100644 --- a/core/java/android/bluetooth/BluetoothDevice.java +++ b/core/java/android/bluetooth/BluetoothDevice.java @@ -945,8 +945,13 @@ public final class BluetoothDevice implements Parcelable { * was started. */ public boolean fetchUuidsWithSdp() { + IBluetooth service = sService; + if (service == null) { + Log.e(TAG, "BT not enabled. Cannot fetchUuidsWithSdp"); + return false; + } try { - return sService.fetchRemoteUuids(this); + return service.fetchRemoteUuids(this); } catch (RemoteException e) {Log.e(TAG, "", e);} return false; } |