diff options
| author | Jakub Pawlowski <jpawlowski@google.com> | 2018-11-29 00:10:18 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-11-29 00:10:18 -0800 |
| commit | 591a68a5a1f96a501364f31b15485c39e4a456e4 (patch) | |
| tree | d3c331559bd211e6927faa6da06cacb45644f006 /core/java/android | |
| parent | 70a2813e861ed728d0aa2b2d50977b3b99876149 (diff) | |
| parent | 658e6530ba97ca2c6f1ad6c10dd4a9f170ef9cda (diff) | |
Merge "Bluetooth: Fix NPE when accesing Manufacturer Data of invalid ScanRecord"
am: 658e6530ba
Change-Id: I46dae495ee3214d0e1d9c8a7d191256423256b3a
Diffstat (limited to 'core/java/android')
| -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); } |