summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSetup Wizard Team <android-setup-team-eng@google.com>2022-09-07 10:19:12 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-09-07 10:19:12 +0000
commit0c20578267b9dddc20b01761eca847937a19a379 (patch)
treeb83bbf920bd690471248967ee6c1035399b0fad3
parent44cb76dd9069dc80c5f79e0937b766b789bc07b4 (diff)
parent2bc2bf601f1ef043a90a2c32e7b324efc247f095 (diff)
downloadsetupcompat-0c20578267b9dddc20b01761eca847937a19a379.tar.gz
Import updated Android SetupCompat Library 470898494 am: 2bc2bf601f
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupcompat/+/19852398 Change-Id: I60f66b8f4b93a8b7e4493f9dd3af647c6bff4b24 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--main/java/com/google/android/setupcompat/util/WizardManagerHelper.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/main/java/com/google/android/setupcompat/util/WizardManagerHelper.java b/main/java/com/google/android/setupcompat/util/WizardManagerHelper.java
index 90de25e..f28cd6d 100644
--- a/main/java/com/google/android/setupcompat/util/WizardManagerHelper.java
+++ b/main/java/com/google/android/setupcompat/util/WizardManagerHelper.java
@@ -186,7 +186,8 @@ public final class WizardManagerHelper {
}
/**
- * Checks whether an intent is running in the portal setup wizard flow.
+ * Checks whether an intent is running in the portal setup wizard flow. This API is supported
+ * since S.
*
* @param originalIntent The original intent that was used to start the step, usually via {@link
* Activity#getIntent()}.
@@ -230,8 +231,11 @@ public final class WizardManagerHelper {
}
/**
- * Returns true if the intent passed in indicates that it is running in any setup wizard flow,
- * including initial setup and deferred setup etc.
+ * Since Q, returns true if the intent passed in indicates that it is running in setup wizard
+ * flows, including initial, predeferred, deferred. Since S, it also supports portal setup.
+ *
+ * <p>Pre-Q, it is running in three setup wizard flows, including initial, predeferred, deferred
+ * setup.
*
* @param originalIntent The original intent that was used to start the step, usually via {@link
* Activity#getIntent()}.