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

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

Merge "ScanRecord.getServiceData NPE fix" am: d62f74e8 am: 8d0eb018 

am: 00f135d1

Change-Id: I135fab3c06ec72ace8b43d2355ee5ba578306a1c
parents e9922a88 00f135d1

core/java/android/bluetooth/le/ScanRecord.java

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ public final class ScanRecord { 
     */

    @Nullable

    public byte[] getServiceData(ParcelUuid serviceDataUuid) {

        if (serviceDataUuid == null) {

        if (serviceDataUuid == null || mServiceData == null) {

            return null;

        }

        return mServiceData.get(serviceDataUuid);