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

Commit d60550f4 authored by Andrew Solovay's avatar Andrew Solovay Committed by Automerger Merge Worker
Browse files

Merge "docs: Fixing broken Javadoc comments" into rvc-dev am: 9e2fa504 

Change-Id: If037ea3c7a8d050f637d85291ccc0412cf4395ad
parents 1a25ebb6 9e2fa504

core/java/android/content/pm/LauncherApps.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -1870,7 +1870,7 @@ public class LauncherApps { 
     * an {@link #ACTION_CONFIRM_PIN_SHORTCUT} or {@link #ACTION_CONFIRM_PIN_APPWIDGET} intent

     * an {@link #ACTION_CONFIRM_PIN_SHORTCUT} or {@link #ACTION_CONFIRM_PIN_APPWIDGET} intent

     * respectively to the default launcher app.

     * respectively to the default launcher app.

     *

     *

     * <h3>Request of the {@link #REQUEST_TYPE_SHORTCUT} type.

     * <h3>Request of the {@link #REQUEST_TYPE_SHORTCUT} type.</h3>

     *

     *

     * <p>A {@link #REQUEST_TYPE_SHORTCUT} request represents a request to pin a

     * <p>A {@link #REQUEST_TYPE_SHORTCUT} request represents a request to pin a

     * {@link ShortcutInfo}.  If the launcher accepts a request, call {@link #accept()},

     * {@link ShortcutInfo}.  If the launcher accepts a request, call {@link #accept()},
@@ -1887,7 +1887,7 @@ public class LauncherApps { 
     *

     *

     * <p>See also {@link ShortcutManager} for more details.

     * <p>See also {@link ShortcutManager} for more details.

     *

     *

     * <h3>Request of the {@link #REQUEST_TYPE_APPWIDGET} type.

     * <h3>Request of the {@link #REQUEST_TYPE_APPWIDGET} type.</h3>

     *

     *

     * <p>A {@link #REQUEST_TYPE_SHORTCUT} request represents a request to pin a

     * <p>A {@link #REQUEST_TYPE_SHORTCUT} request represents a request to pin a

     * an AppWidget.  If the launcher accepts a request, call {@link #accept(Bundle)} with

     * an AppWidget.  If the launcher accepts a request, call {@link #accept(Bundle)} with

core/java/android/service/autofill/AutofillService.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -455,7 +455,7 @@ import android.view.autofill.AutofillValue; 
 * heuristics purposes, but it should not be sent to external servers.

 * heuristics purposes, but it should not be sent to external servers.

 *

 *

 * <a name="FieldClassification"></a>

 * <a name="FieldClassification"></a>

 * <h3>Metrics and field classification</h3

 * <h3>Metrics and field classification</h3>

 *

 *

 * <p>The service can call {@link #getFillEventHistory()} to get metrics representing the user

 * <p>The service can call {@link #getFillEventHistory()} to get metrics representing the user

 * actions, and then use these metrics to improve its heuristics.

 * actions, and then use these metrics to improve its heuristics.