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

Commit e5144023 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update parcel read for ScanFilter" am: 8392aabf am: 07238d02 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1970943

Change-Id: Ibde7db66e8c5458a66a8448ab8c963f5476dd20b
parents fc07b956 07238d02

framework/java/android/bluetooth/le/ScanFilter.java

+8 −9
Original line number Diff line number Diff line
@@ -291,10 +291,10 @@ public final class ScanFilter implements Parcelable { 


            // Advertising data type

            int advertisingDataType = in.readInt();

            if (advertisingDataType != -1) {

            if (in.readInt() == 1) {

                byte[] advertisingData = null;

                byte[] advertisingDataMask = null;

                if (in.readInt() == 1) {



                int advertisingDataLength = in.readInt();

                advertisingData = new byte[advertisingDataLength];

                in.readByteArray(advertisingData);
@@ -303,7 +303,6 @@ public final class ScanFilter implements Parcelable { 
                    advertisingDataMask = new byte[advertisingDataMaskLength];

                    in.readByteArray(advertisingDataMask);

                }

                }

                builder.setAdvertisingDataWithType(advertisingDataType, advertisingData,

                        advertisingDataMask);

            }