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

Commit 7ba69dd8 authored by Griff Hazen's avatar Griff Hazen Committed by Android Git Automerger
Browse files

am 9e1379f1: Fix sdk docs build for framework from remote input api addition. 

* commit '9e1379f1':
  Fix sdk docs build for framework from remote input api addition.
parents 8f1e7ade 9e1379f1

core/java/android/app/Notification.java

+1 −1
Original line number Diff line number Diff line
@@ -1878,7 +1878,7 @@ public class Notification implements Parcelable 
         * cause this value to be ignored.

         *

         * <p>This sort key can also be used to order members of a notification group. See

         * {@link Builder#setGroup}.

         * {@link #setGroup}.

         *

         * @see String#compareTo(String)

         */

core/java/android/app/RemoteInput.java

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ public final class RemoteInput implements Parcelable { 
         * Specifies choices available to the user to satisfy this input.

         * @param choices an array of pre-defined choices for users input.

         *        You must provide a non-null and non-empty array if

         *        you set {@link #mAllowFreeFormInput} to {@code false}.

         *        you disabled free form input using {@link #setAllowFreeFormInput}.

         * @return this object for method chaining

         */

        public Builder setChoices(CharSequence[] choices) {