| commit | 587a8acb6c4d82afe3d2212b20794318869a57bf | [log] [tgz] |
|---|---|---|
| author | Jakub Pawlowski <jpawlowski@google.com> | Thu Nov 29 00:22:00 2018 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Nov 29 00:22:00 2018 -0800 |
| tree | 3f460d165b1369e91c695138306e8764ed9ba837 | |
| parent | 0ff158799a46a9c468e6a6e67a570d197183564c [diff] | |
| parent | 591a68a5a1f96a501364f31b15485c39e4a456e4 [diff] |
Merge "Bluetooth: Fix NPE when accesing Manufacturer Data of invalid ScanRecord" am: 658e6530ba am: 591a68a5a1 Change-Id: I3c8f931cfea06e44853bd21ffd237562b4f45677
diff --git a/core/java/android/bluetooth/le/ScanRecord.java b/core/java/android/bluetooth/le/ScanRecord.java index 7988008..2174255 100644 --- a/core/java/android/bluetooth/le/ScanRecord.java +++ b/core/java/android/bluetooth/le/ScanRecord.java
@@ -116,6 +116,9 @@ */ @Nullable public byte[] getManufacturerSpecificData(int manufacturerId) { + if (mManufacturerSpecificData == null) { + return null; + } return mManufacturerSpecificData.get(manufacturerId); }