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

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

Merge "AdvertiseData: fix nullable collection" am: 85f8cf74 am: 8f608a49 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563681

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I80de479b73c6e8acb62c314ab25e2e93f5ed0669
parents 32aea70b 8f608a49

framework/java/android/bluetooth/le/AdvertiseData.java

+3 −3
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ public final class AdvertiseData implements Parcelable { 
    @Nullable

    private final List<ParcelUuid> mServiceUuids;



    @Nullable

    @NonNull

    private final List<ParcelUuid> mServiceSolicitationUuids;



    private final SparseArray<byte[]> mManufacturerSpecificData;
@@ -77,7 +77,7 @@ public final class AdvertiseData implements Parcelable { 
    /**

     * Returns a list of service solicitation UUIDs within the advertisement that we invite to connect.

     */

    @Nullable

    @NonNull

    public List<ParcelUuid> getServiceSolicitationUuids() {

        return mServiceSolicitationUuids;

    }
@@ -221,7 +221,7 @@ public final class AdvertiseData implements Parcelable { 
    public static final class Builder {

        @Nullable

        private List<ParcelUuid> mServiceUuids = new ArrayList<ParcelUuid>();

        @Nullable

        @NonNull

        private List<ParcelUuid> mServiceSolicitationUuids = new ArrayList<ParcelUuid>();

        private SparseArray<byte[]> mManufacturerSpecificData = new SparseArray<byte[]>();

        private Map<ParcelUuid, byte[]> mServiceData = new ArrayMap<ParcelUuid, byte[]>();