Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "AdvertiseData: fix nullable collection" am: 0f12a22aa6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I568b51ac671aab2e0d5614fb65bdc3cc797268fa
This commit is contained in:
Treehugger Robot
2021-02-03 22:45:42 +00:00
committed by Automerger Merge Worker
parent a184cbd7fb 0f12a22aa6
commit acb38137cd
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -9140,7 +9140,7 @@ package android.bluetooth.le {
method public boolean getIncludeTxPowerLevel(); method public boolean getIncludeTxPowerLevel();
method public android.util.SparseArray<byte[]> getManufacturerSpecificData(); method public android.util.SparseArray<byte[]> getManufacturerSpecificData();
method public java.util.Map<android.os.ParcelUuid,byte[]> getServiceData(); 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 java.util.List<android.os.ParcelUuid> getServiceUuids();
method public void writeToParcel(android.os.Parcel, int); method public void writeToParcel(android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.le.AdvertiseData> CREATOR; field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.le.AdvertiseData> CREATOR;

6
core/java/android/bluetooth/le/AdvertiseData.java
View File

@@ -44,7 +44,7 @@ public final class AdvertiseData implements Parcelable {
@Nullable @Nullable
private final List<ParcelUuid> mServiceUuids; private final List<ParcelUuid> mServiceUuids;
@Nullable @NonNull
private final List<ParcelUuid> mServiceSolicitationUuids; private final List<ParcelUuid> mServiceSolicitationUuids;
private final SparseArray<byte[]> mManufacturerSpecificData; 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. * Returns a list of service solicitation UUIDs within the advertisement that we invite to connect.
*/ */
@Nullable @NonNull
public List<ParcelUuid> getServiceSolicitationUuids() { public List<ParcelUuid> getServiceSolicitationUuids() {
return mServiceSolicitationUuids; return mServiceSolicitationUuids;
} }
@@ -221,7 +221,7 @@ public final class AdvertiseData implements Parcelable {
public static final class Builder { public static final class Builder {
@Nullable @Nullable
private List<ParcelUuid> mServiceUuids = new ArrayList<ParcelUuid>(); private List<ParcelUuid> mServiceUuids = new ArrayList<ParcelUuid>();
@Nullable @NonNull
private List<ParcelUuid> mServiceSolicitationUuids = new ArrayList<ParcelUuid>(); private List<ParcelUuid> mServiceSolicitationUuids = new ArrayList<ParcelUuid>();
private SparseArray<byte[]> mManufacturerSpecificData = new SparseArray<byte[]>(); private SparseArray<byte[]> mManufacturerSpecificData = new SparseArray<byte[]>();
private Map<ParcelUuid, byte[]> mServiceData = new ArrayMap<ParcelUuid, byte[]>(); private Map<ParcelUuid, byte[]> mServiceData = new ArrayMap<ParcelUuid, byte[]>();