| commit | 59880123d73f5c2fa508ec3baff03da996c64931 | [log] [tgz] |
|---|---|---|
| author | Jakub Pawlowski <jpawlowski@google.com> | Mon Jun 04 10:32:06 2018 -0700 |
| committer | Jakub Pawlowski <jpawlowski@google.com> | Mon Jun 11 14:43:42 2018 +0000 |
| tree | aba2c032c991ed111603cb7b2b9f7a610dffa52c | |
| parent | bfe3b1a691c1350c10cb0dcd5837cb634ddebbd2 [diff] |
ScanRecord.getServiceData NPE fix Bug: 109662587 Change-Id: I0e9653d9cd7e4b748870bacb6fbcecae535ebb2a
diff --git a/core/java/android/bluetooth/le/ScanRecord.java b/core/java/android/bluetooth/le/ScanRecord.java index f8aaba9..04dd060 100644 --- a/core/java/android/bluetooth/le/ScanRecord.java +++ b/core/java/android/bluetooth/le/ScanRecord.java
@@ -117,7 +117,7 @@ */ @Nullable public byte[] getServiceData(ParcelUuid serviceDataUuid) { - if (serviceDataUuid == null) { + if (serviceDataUuid == null || mServiceData == null) { return null; } return mServiceData.get(serviceDataUuid);