summaryrefslogtreecommitdiff
path: root/telecomm
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2021-02-04 15:53:34 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2021-02-04 15:53:34 +0000
commit60f3d5cee463ca09aa969fa9ab3cd087764e71f5 (patch)
tree521c8026259b354bae25ec4c733633383f5b4942 /telecomm
parent5f36d6f70a5cfeb598647757f9a16c6e6b50daa5 (diff)
parentf3d73871240fff4936e16e2dad21a45a10436cb9 (diff)
Merge changes from topic "nullablecollection"
* changes: API: Suppress existing NullableCollections lints (TaskOrganizer) API: Suppress existing NullableCollections lints
Diffstat (limited to 'telecomm')
-rw-r--r--telecomm/java/android/telecom/ConnectionRequest.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/telecomm/java/android/telecom/ConnectionRequest.java b/telecomm/java/android/telecom/ConnectionRequest.java
index b73ef9b794e4..be5fae488d5e 100644
--- a/telecomm/java/android/telecom/ConnectionRequest.java
+++ b/telecomm/java/android/telecom/ConnectionRequest.java
@@ -18,6 +18,7 @@ package android.telecom;
import android.annotation.NonNull;
import android.annotation.Nullable;
+import android.annotation.SuppressLint;
import android.annotation.SystemApi;
import android.annotation.TestApi;
import android.net.Uri;
@@ -67,7 +68,8 @@ public final class ConnectionRequest implements Parcelable {
* Sets the participants for the resulting {@link ConnectionRequest}
* @param participants The participants to which the {@link Connection} is to connect.
*/
- public @NonNull Builder setParticipants(@Nullable List<Uri> participants) {
+ public @NonNull Builder setParticipants(
+ @SuppressLint("NullableCollection") @Nullable List<Uri> participants) {
this.mParticipants = participants;
return this;
}