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

Commit 98f07d90 authored by Ricardo Cervera's avatar Ricardo Cervera Committed by Android Git Automerger
Browse files

am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 

* commit '92f6a747':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
parents 74147527 92f6a747

core/java/android/app/Activity.java

+4 −0
Original line number Diff line number Diff line
@@ -4317,6 +4317,10 @@ public class Activity extends ContextThemeWrapper 
     * <p>You will receive this call immediately before onResume() when your

     * activity is re-starting.

     *

     * <p>This method is never invoked if your activity sets

     * {@link android.R.styleable#AndroidManifestActivity_noHistory noHistory} to

     * <code>true</code>.

     * 

     * @param requestCode The integer request code originally supplied to

     *                    startActivityForResult(), allowing you to identify who this

     *                    result came from.

core/java/android/content/Intent.java

+4 −0
Original line number Diff line number Diff line
@@ -3400,6 +3400,10 @@ public class Intent implements Parcelable, Cloneable { 
     * the user navigates away from it, the activity is finished.  This may also

     * be set with the {@link android.R.styleable#AndroidManifestActivity_noHistory

     * noHistory} attribute.

     *

     * <p>If set, {@link android.app.Activity#onActivityResult onActivityResult()}

     * is never invoked when the current activity starts a new activity which

     * sets a result and finishes.

     */

    public static final int FLAG_ACTIVITY_NO_HISTORY = 0x40000000;

    /**

docs/html/guide/topics/manifest/activity-element.jd

+3 −1
Original line number Diff line number Diff line
@@ -565,7 +565,9 @@ visible on screen &mdash; "{@code true}" if it should be finished, and 
<p>

A value of "{@code true}" means that the activity will not leave a

historical trace.  It will not remain in the activity stack for the task,

so the user will not be able to return to it.

so the user will not be able to return to it. In this case,

{@link android.app.Activity#onActivityResult onActivityResult()} is never called if you

start another activity for a result from this activity.

</p>



<p>