Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed8e0f6f authored by Tony Mak's avatar Tony Mak Committed by android-build-merger
Browse files

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

am: 10f8ed0c

Change-Id: I4ebb83d6fc174ad3bb68cfded32505dc29327ee3
parents d522a39d 10f8ed0c

core/java/android/view/textclassifier/TextSelection.java

+2 −2
Original line number Diff line number Diff line
@@ -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;

        }