Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d20d24dc authored by Erik Wolsheimer's avatar Erik Wolsheimer Committed by Automerger Merge Worker
Browse files

Merge "Describe time base/units on ACTION_VIEW_PERMISSION_USAGE_FOR_PERIOD"... 

Merge "Describe time base/units on ACTION_VIEW_PERMISSION_USAGE_FOR_PERIOD" into sc-dev am: af00dc92 am: 1c0a2f03 am: 2c073366

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14707023

Change-Id: I60eef0e30da65ec4d738ac95c9e44cead592361d
parents 69efac96 2c073366

core/java/android/content/Intent.java

+4 −4
Original line number Diff line number Diff line
@@ -2013,12 +2013,12 @@ public class Intent implements Parcelable, Cloneable { 
     * Input: {@link #EXTRA_ATTRIBUTION_TAGS} specifies the attribution tags for the usage entry.

     * </p>

     * <p>

     * Input: {@link #EXTRA_START_TIME} specifies the start time of the period. Both start time and

     * end time are needed and start time must be <= end time.

     * Input: {@link #EXTRA_START_TIME} specifies the start time of the period (epoch time in

     * millis). Both start time and end time are needed and start time must be <= end time.

     * </p>

     * <p>

     * Input: {@link #EXTRA_END_TIME} specifies the end time of the period. Both start time and end

     * time are needed and start time must be <= end time.

     * Input: {@link #EXTRA_END_TIME} specifies the end time of the period (epoch time in

     * millis). Both start time and end time are needed and start time must be <= end time.

     * </p>

     * <p>

     * Output: Nothing.