diff options
| author | Jakub Pawlowski <jpawlowski@google.com> | 2018-06-11 09:16:39 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-06-11 09:16:39 -0700 |
| commit | 00f135d1beba9ea79732625e9bf3fcbebeb797b3 (patch) | |
| tree | 8b3061073442ac5670fbc3aebeef2b3dc2c4065a /core/java/android | |
| parent | 3ef3fae23241a453111c3143e7813bf2eea7dcf6 (diff) | |
| parent | 8d0eb018436683c7fa6147277c6a1168b292af5e (diff) | |
Merge "ScanRecord.getServiceData NPE fix" am: d62f74e806
am: 8d0eb01843
Change-Id: I9a7e94cb51f724da7d089fbe027a06d36ad5ebb4
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/bluetooth/le/ScanRecord.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/bluetooth/le/ScanRecord.java b/core/java/android/bluetooth/le/ScanRecord.java index f8aaba910b7b..04dd060cae5d 100644 --- a/core/java/android/bluetooth/le/ScanRecord.java +++ b/core/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); |