Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf69b266 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

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

am: f654ea07

Change-Id: I3c8f931cfea06e44853bd21ffd237562b4f45677
parents 3fb7ade2 f654ea07

framework/java/android/bluetooth/le/ScanRecord.java

+3 −0
Original line number Diff line number Diff line
@@ -116,6 +116,9 @@ public final class ScanRecord { 
     */

    @Nullable

    public byte[] getManufacturerSpecificData(int manufacturerId) {

        if (mManufacturerSpecificData == null) {

            return null;

        }

        return mManufacturerSpecificData.get(manufacturerId);

    }