Merge "TextSelection.Builder.setId should take null as well" into pi-dev

2018-05-16 23:52:14 +00:00
parent fa05aa0ff8 84368781ec
commit 10f8ed0cf8
1 changed files with 2 additions and 2 deletions
--- a/core/java/android/view/textclassifier/TextSelection.java
+++ b/core/java/android/view/textclassifier/TextSelection.java
@@ -154,8 +154,8 @@ public final class TextSelection implements Parcelable {
         * Sets an id for the TextSelection object.
         */
        @NonNull
-        public Builder setId(@NonNull String id) {
-            mId = Preconditions.checkNotNull(id);
+        public Builder setId(@Nullable String id) {
+            mId = id;
            return this;
        }