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

am: 10f8ed0cf8 Change-Id: I4ebb83d6fc174ad3bb68cfded32505dc29327ee3
2018-05-16 17:02:41 -07:00
parent d522a39df7 10f8ed0cf8
commit ed8e0f6fe6
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;
        }