Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Bluetooth: Fix NPE when accesing Manufacturer Data of invalid ScanRecord"

Browse Source
This commit is contained in:
Jakub Pawlowski
2018-11-29 07:21:01 +00:00
committed by Gerrit Code Review
parent 8757179e52 4c2aa61202
commit 658e6530ba
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/bluetooth/le/ScanRecord.java
View File

@@ -116,6 +116,9 @@ public final class ScanRecord {
*/ */
@Nullable @Nullable
public byte[] getManufacturerSpecificData(int manufacturerId) { public byte[] getManufacturerSpecificData(int manufacturerId) {
if (mManufacturerSpecificData == null) {
return null;
}
return mManufacturerSpecificData.get(manufacturerId); return mManufacturerSpecificData.get(manufacturerId);
} }