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

Commit 3b6167a6 authored by Haoran Zhang's avatar Haoran Zhang Committed by Android (Google) Code Review
Browse files

Merge "[Framework] Update requestCode comment to make it explicit if < 0, no... 

Merge "[Framework] Update requestCode comment to make it explicit if < 0, no result will return" into main
parents cf2170fb d54e7d60

core/java/android/app/Activity.java

+18 −10
Original line number Diff line number Diff line
@@ -5823,7 +5823,8 @@ public class Activity extends ContextThemeWrapper 
     *

     * @param intent The intent to start.

     * @param requestCode If >= 0, this code will be returned in

     *                    onActivityResult() when the activity exits.

     *                    onActivityResult() when the activity exits;

     *                    If < 0, no result will return when the activity exits.

     *

     * @throws android.content.ActivityNotFoundException

     *
@@ -5858,7 +5859,8 @@ public class Activity extends ContextThemeWrapper 
     *

     * @param intent The intent to start.

     * @param requestCode If >= 0, this code will be returned in

     *                    onActivityResult() when the activity exits.

     *                    onActivityResult() when the activity exits;

     *                    If < 0, no result will return when the activity exits.

     * @param options Additional options for how the Activity should be started.

     * See {@link android.content.Context#startActivity(Intent, Bundle)}

     * Context.startActivity(Intent, Bundle)} for more details.
@@ -5966,7 +5968,8 @@ public class Activity extends ContextThemeWrapper 
     *

     * @param intent      The intent to start.

     * @param requestCode If >= 0, this code will be returned in

     *                    onActivityResult() when the activity exits.

     *                    onActivityResult() when the activity exits;

     *                    If < 0, no result will return when the activity exits.

     * @param user        The user to start the intent as.

     * @hide Implement to provide correct calling token.

     */
@@ -6002,7 +6005,8 @@ public class Activity extends ContextThemeWrapper 
     *

     * @param intent      The intent to start.

     * @param requestCode If >= 0, this code will be returned in

     *                    onActivityResult() when the activity exits.

     *                    onActivityResult() when the activity exits;

     *                    If < 0, no result will return when the activity exits.

     * @param options     Additional options for how the Activity should be started. See {@link

     *                    android.content.Context#startActivity(Intent, Bundle)} for more details.

     * @param user        The user to start the intent as.
@@ -6040,7 +6044,8 @@ public class Activity extends ContextThemeWrapper 
     *

     * @param intent      The intent to start.

     * @param requestCode If >= 0, this code will be returned in

     *                    onActivityResult() when the activity exits.

     *                    onActivityResult() when the activity exits;

     *                    If < 0, no result will return when the activity exits.

     * @param options     Additional options for how the Activity should be started. See {@link

     *                    android.content.Context#startActivity(Intent, Bundle)} for more details.

     * @param user        The user to start the intent as.
@@ -6166,7 +6171,8 @@ public class Activity extends ContextThemeWrapper 
     *

     * @param intent The IntentSender to launch.

     * @param requestCode If >= 0, this code will be returned in

     *                    onActivityResult() when the activity exits.

     *                    onActivityResult() when the activity exits;

     *                    If < 0, no result will return when the activity exits.

     * @param fillInIntent If non-null, this will be provided as the

     * intent parameter to {@link IntentSender#sendIntent}.

     * @param flagsMask Intent flags in the original IntentSender that you
@@ -6205,7 +6211,8 @@ public class Activity extends ContextThemeWrapper 
     *

     * @param intent The IntentSender to launch.

     * @param requestCode If >= 0, this code will be returned in

     *                    onActivityResult() when the activity exits.

     *                    onActivityResult() when the activity exits;

     *                    If < 0, no result will return when the activity exits.

     * @param fillInIntent If non-null, this will be provided as the

     * intent parameter to {@link IntentSender#sendIntent}.

     * @param flagsMask Intent flags in the original IntentSender that you
@@ -6437,8 +6444,8 @@ public class Activity extends ContextThemeWrapper 
     *

     * @param intent The intent to start.

     * @param requestCode If >= 0, this code will be returned in

     *         onActivityResult() when the activity exits, as described in

     *         {@link #startActivityForResult}.

     *         onActivityResult() when the activity exits; If < 0, no result will

     *         return when the activity exits, as described in {@link #startActivityForResult}.

     *

     * @return If a new activity was launched then true is returned; otherwise

     *         false is returned and you must handle the Intent yourself.
@@ -6469,7 +6476,8 @@ public class Activity extends ContextThemeWrapper 
     *

     * @param intent The intent to start.

     * @param requestCode If >= 0, this code will be returned in

     *         onActivityResult() when the activity exits, as described in

     *         onActivityResult() when the activity exits; If < 0, no result

     *         will return when the activity exits, as described in

     *         {@link #startActivityForResult}.

     * @param options Additional options for how the Activity should be started.

     * See {@link android.content.Context#startActivity(Intent, Bundle)}