diff options
| author | Jakub Pawlowski <jpawlowski@google.com> | 2018-06-11 14:43:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-06-11 14:43:57 +0000 |
| commit | cd6875ef44dd3ddaf6ee2beaa8df31aafe9861be (patch) | |
| tree | 0c14df5381ac8faeee0f21d6f9d87d17a43e21f6 /framework/java/android/bluetooth | |
| parent | 19c1d4f621e26210c5baeb295443fb6ffb0f1dc3 (diff) | |
| parent | bcb396fab5a3d6d316c2a6633a27de9cb77c548b (diff) | |
Merge "ScanRecord.getServiceData NPE fix"
Diffstat (limited to 'framework/java/android/bluetooth')
| -rw-r--r-- | framework/java/android/bluetooth/le/ScanRecord.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/framework/java/android/bluetooth/le/ScanRecord.java b/framework/java/android/bluetooth/le/ScanRecord.java index f8aaba910b..04dd060cae 100644 --- a/framework/java/android/bluetooth/le/ScanRecord.java +++ b/framework/java/android/bluetooth/le/ScanRecord.java @@ -117,7 +117,7 @@ public final class ScanRecord { */ @Nullable public byte[] getServiceData(ParcelUuid serviceDataUuid) { - if (serviceDataUuid == null) { + if (serviceDataUuid == null || mServiceData == null) { return null; } return mServiceData.get(serviceDataUuid); |