diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-03 23:22:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-03 23:22:56 +0000 |
| commit | f6112be2aaabc05d3943a9dd61b3f4bee254d8d1 (patch) | |
| tree | f0afbbe8eaa969729cee202d83f509936a2e5753 /framework/java/android/bluetooth/le/AdvertiseData.java | |
| parent | acfeda847d55a1ba26648a1911120ab5efeb1002 (diff) | |
| parent | 0a328d9fe27a9b3c4f5437dbf4ce6e4e92a397a8 (diff) | |
Merge "AdvertiseData: fix nullable collection" am: 85f8cf7488 am: 8f608a49b5 am: 0a328d9fe2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563681
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6cad0419179b893a4b936ec03bc2f3ab9a92e5c5
Diffstat (limited to 'framework/java/android/bluetooth/le/AdvertiseData.java')
| -rw-r--r-- | framework/java/android/bluetooth/le/AdvertiseData.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/framework/java/android/bluetooth/le/AdvertiseData.java b/framework/java/android/bluetooth/le/AdvertiseData.java index 397326c7fd..cec658049c 100644 --- a/framework/java/android/bluetooth/le/AdvertiseData.java +++ b/framework/java/android/bluetooth/le/AdvertiseData.java @@ -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[]>(); |