summaryrefslogtreecommitdiff
path: root/core/java/android/app/Activity.java
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2019-09-11 20:31:32 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-09-11 20:31:32 +0000
commitad324a3d7e61981dabc00aab83457b071f35fafd (patch)
tree7ed93c64731acc204ecae5e1a1140665d0eb13c4 /core/java/android/app/Activity.java
parent80743ffc075dc74310f8a12d63644a17d99fe8cd (diff)
parentd57e959e719c13ab842f7a92750d8079f4543fe3 (diff)
Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master" into stage-aosp-master
Diffstat (limited to 'core/java/android/app/Activity.java')
-rw-r--r--core/java/android/app/Activity.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index dc52c52cca1f..f5b0b592e6a7 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -1547,7 +1547,9 @@ public class Activity extends ContextThemeWrapper
* had previously been frozen by {@link #onSaveInstanceState}.
*
* <p>This method is called between {@link #onStart} and
- * {@link #onPostCreate}.
+ * {@link #onPostCreate}. This method is called only when recreating
+ * an activity; the method isn't invoked if {@link #onStart} is called for
+ * any other reason.</p>
*
* @param savedInstanceState the data most recently supplied in {@link #onSaveInstanceState}.
*