diff options
| author | 2018-11-29 00:39:27 -0800 | |
|---|---|---|
| committer | 2018-11-29 00:39:27 -0800 | |
| commit | 9676bc2d4d19b41babfbee290ac33fdf07fb7472 (patch) | |
| tree | bb15ceeb7c19387b07ac1147a2cee9b4e0501870 | |
| parent | 9ab9d46a864923fa6cb180a4dc7961881b59855c (diff) | |
| parent | 587a8acb6c4d82afe3d2212b20794318869a57bf (diff) | |
Merge "Bluetooth: Fix NPE when accesing Manufacturer Data of invalid ScanRecord" am: 658e6530ba am: 591a68a5a1
am: 587a8acb6c
Change-Id: I88459ae16e0492ea877983252aae03ad5714a306
| -rw-r--r-- | core/java/android/bluetooth/le/ScanRecord.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/bluetooth/le/ScanRecord.java b/core/java/android/bluetooth/le/ScanRecord.java index 7988008f03c0..2174255a3619 100644 --- a/core/java/android/bluetooth/le/ScanRecord.java +++ b/core/java/android/bluetooth/le/ScanRecord.java @@ -116,6 +116,9 @@ public final class ScanRecord { */ @Nullable public byte[] getManufacturerSpecificData(int manufacturerId) { + if (mManufacturerSpecificData == null) { + return null; + } return mManufacturerSpecificData.get(manufacturerId); } |