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

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

Merge "AdvertiseData: fix nullable collection" am: 0f12a22a am: acb38137 am: 5a1c2561 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6cad0419179b893a4b936ec03bc2f3ab9a92e5c5
parents 933f1de9 5a1c2561

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -9280,7 +9280,7 @@ package android.bluetooth.le { 
    method public boolean getIncludeTxPowerLevel();

    method public android.util.SparseArray<byte[]> getManufacturerSpecificData();

    method public java.util.Map<android.os.ParcelUuid,byte[]> getServiceData();

    method @Nullable public java.util.List<android.os.ParcelUuid> getServiceSolicitationUuids();

    method @NonNull public java.util.List<android.os.ParcelUuid> getServiceSolicitationUuids();

    method public java.util.List<android.os.ParcelUuid> getServiceUuids();

    method public void writeToParcel(android.os.Parcel, int);

    field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.le.AdvertiseData> CREATOR;

core/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[]>();