Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update Documentation for onActivityResult." into rvc-dev

Browse Source
This commit is contained in:
Diego Vela
2020-04-27 17:58:29 +00:00
committed by Android (Google) Code Review
parent 82e9872732 6e99bfcd6c
commit 7c59c63943
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/app/Activity.java
View File

@@ -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