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

Commit 1ac3746a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic "ctor-refs" 

* changes:
  Update inner class constructor refs to use proper syntax.
  Fix broken @see tags in public documentation.
parents 1ba0bc20 2e5f38e0

core/java/android/app/Activity.java

+0 −1
Original line number Diff line number Diff line
@@ -3618,7 +3618,6 @@ public class Activity extends ContextThemeWrapper 
     * To receive this callback, you must return true from onKeyDown for the current

     * event stream.

     *

     * @see KeyEvent.Callback#onKeyLongPress()

     * @see KeyEvent.Callback#onKeyLongPress(int, KeyEvent)

     */

    public boolean onKeyLongPress(int keyCode, KeyEvent event) {

core/java/android/app/ActivityManager.java

+1 −2
Original line number Diff line number Diff line
@@ -2082,8 +2082,7 @@ public class ActivityManager { 
     * has access to it.

     *

     * @see ActivityOptions#setLaunchDisplayId(int)

     * @see android.view.Display.FLAG_PRIVATE

     * @see android.view.Display.TYPE_VIRTUAL

     * @see android.view.Display#FLAG_PRIVATE

     *

     * @param context Source context, from which an activity will be started.

     * @param displayId Target display id.

core/java/android/app/Instrumentation.java

+1 −1
Original line number Diff line number Diff line
@@ -729,7 +729,7 @@ public class Instrumentation { 
         * a non-null value if the intent needs to be intercepted.

         *

         * <p> Whenever a new activity is started, this method will be called on instances created

         * using {@link #Instrumentation.ActivityMonitor()} to check if there is a match. In case

         * using {@link #ActivityMonitor()} to check if there is a match. In case

         * of a match, the activity start will be blocked and the returned result will be used.

         *

         * @param intent The intent used for starting the activity.

core/java/android/app/Notification.java

+3 −3
Original line number Diff line number Diff line
@@ -3437,7 +3437,7 @@ public class Notification implements Parcelable 
        }



        /**

         * @deprecated use {@link Notification.Builder#Notification.Builder(Context, String)}

         * @deprecated use {@link #Builder(Context, String)}

         * instead. All posted Notifications must specify a NotificationChannel Id.

         */

        @Deprecated
@@ -7071,7 +7071,7 @@ public class Notification implements Parcelable 
         * Should be unique amongst all individuals in the conversation, and should be

         * consistent during re-posts of the notification.

         *

         * @see Message#Notification.MessagingStyle.Message(CharSequence, long, CharSequence)

         * @see Message#Message(CharSequence, long, CharSequence)

         *

         * @return this object for method chaining

         *
@@ -7091,7 +7091,7 @@ public class Notification implements Parcelable 
         * Should be <code>null</code> for messages by the current user, in which case

         * the platform will insert the user set in {@code MessagingStyle(Person)}.

         *

         * @see Message#Notification.MessagingStyle.Message(CharSequence, long, CharSequence)

         * @see Message#Message(CharSequence, long, CharSequence)

         *

         * @return this object for method chaining

         */

core/java/android/app/NotificationManager.java

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ public class NotificationManager { 
     * </p>

     * </p>

     *

     * @see {@link #addAutomaticZenRule(AutomaticZenRule)}

     * @see #addAutomaticZenRule(AutomaticZenRule)

     */

    @SdkConstant(SdkConstant.SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_AUTOMATIC_ZEN_RULE =