diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-06-08 19:46:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-08 19:46:24 +0000 |
| commit | 54d729b73f54798d3112129894cb6fe8ef75920b (patch) | |
| tree | f9ac0e9440ff058a879f7a1cff4e1746629612a9 /core/java | |
| parent | 383ce580b1c9e706d1b06a23d81986f3b4ed83fb (diff) | |
| parent | 67ba2c7fa25a635c640956ff3a5e64164cb23396 (diff) | |
| download | frameworks_base-54d729b73f54798d3112129894cb6fe8ef75920b.zip frameworks_base-54d729b73f54798d3112129894cb6fe8ef75920b.tar.gz frameworks_base-54d729b73f54798d3112129894cb6fe8ef75920b.tar.bz2 | |
Merge "Fix issue #21572679: API Review: ActivityOptions, usage time report" into mnc-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/ActivityOptions.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/app/ActivityOptions.java b/core/java/android/app/ActivityOptions.java index 9f23b43..6fb997e 100644 --- a/core/java/android/app/ActivityOptions.java +++ b/core/java/android/app/ActivityOptions.java @@ -41,16 +41,16 @@ public class ActivityOptions { /** * A long in the extras delivered by {@link #requestUsageTimeReport} that contains - * the total time (in ms) the user spent in the app. + * the total time (in ms) the user spent in the app flow. */ - public static final String EXTRA_USAGE_REPORT_TIME = "android.time"; + public static final String EXTRA_USAGE_TIME_REPORT = "android.usage_time"; /** * A Bundle in the extras delivered by {@link #requestUsageTimeReport} that contains * detailed information about the time spent in each package associated with the app; * each key is a package name, whose value is a long containing the time (in ms). */ - public static final String EXTRA_USAGE_REPORT_PACKAGES = "android.package"; + public static final String EXTRA_USAGE_TIME_REPORT_PACKAGES = "android.usage_time_packages"; /** * The package name that created the options. @@ -915,7 +915,7 @@ public class ActivityOptions { /** * Ask the the system track that time the user spends in the app being launched, and * report it back once done. The report will be sent to the given receiver, with - * the extras {@link #EXTRA_USAGE_REPORT_TIME} and {@link #EXTRA_USAGE_REPORT_PACKAGES} + * the extras {@link #EXTRA_USAGE_TIME_REPORT} and {@link #EXTRA_USAGE_TIME_REPORT_PACKAGES} * filled in. * * <p>The time interval tracked is from launching this activity until the user leaves |