summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Kevin Hufnagle <khufnagle@google.com> 2019-08-06 09:38:01 -0700
committer android-build-merger <android-build-merger@google.com> 2019-08-06 09:38:01 -0700
commit7130f7ed6b923dab55e88268ac1b76ba1e49db84 (patch)
tree0fcd84957a6485baa4e0b3068f6be8d7cc890bd7
parent78a356fd436dd66d8cd5e070c60f93e31784b913 (diff)
parent0f27f04f9b269fbc2d69aca001a9c92992a0d8b7 (diff)
Merge "docs: Clarified when onRestoreInstanceState() executes" into qt-dev am: c80fe63001 am: ad1de8fbe4
am: 0f27f04f9b Change-Id: Ibafe22878438e3f1ce176647a3ba07544d753dbf
-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}.
*