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

Commit a8496c1c authored by Diego Vela's avatar Diego Vela Committed by Automerger Merge Worker
Browse files

Merge "Update Documentation for onActivityResult." into rvc-dev am: 7c59c639 am: d92f5b3d

Change-Id: I097ad2f3960d47262780005f9ba0c3ff56ae3c0a
parents e4ebbcc1 d92f5b3d
Loading
Loading
Loading
Loading
+6 −2
Original line number Diff line number Diff line
@@ -6549,8 +6549,12 @@ public class Activity extends ContextThemeWrapper
     * {@link #RESULT_CANCELED} if the activity explicitly returned that,
     * didn't return any result, or crashed during its operation.
     *
     * <p>You will receive this call immediately before onResume() when your
     * activity is re-starting.
     * <p>An activity can never receive a result in the resumed state. You can count on
     * {@link #onResume} being called after this method, though not necessarily immediately after.
     * If the activity was resumed, it will be paused and the result will be delivered, followed
     * by {@link #onResume}.  If the activity wasn't in the resumed state, then the result will
     * be delivered, with {@link #onResume} called sometime later when the activity becomes active
     * again.
     *
     * <p>This method is never invoked if your activity sets
     * {@link android.R.styleable#AndroidManifestActivity_noHistory noHistory} to