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

Commit c79333d8 authored by Christopher Tate's avatar Christopher Tate Committed by android-build-merger
Browse files

Merge "API feedback: rename JobInfo methods for clarity" into nyc-dev am: b1007775 am: c5bbf34c 

am: 4b8088ea

* commit '4b8088ea':
  API feedback: rename JobInfo methods for clarity

Change-Id: I2ee283a476e1bc706509016c80821e1f9bc1020b
parents 71ad6aab 4b8088ea

api/current.txt

+2 −7
Original line number Diff line number Diff line
@@ -6325,9 +6325,9 @@ package android.app.job { 
    method public long getInitialBackoffMillis();

    method public long getIntervalMillis();

    method public long getMaxExecutionDelayMillis();

    method public static final long getMinFlexMillis();

    method public long getMinLatencyMillis();

    method public static final long getMinimumFlex();

    method public static final long getMinimumPeriod();

    method public static final long getMinPeriodMillis();

    method public int getNetworkType();

    method public android.content.ComponentName getService();

    method public android.os.Bundle getTransientExtras();
@@ -51577,7 +51577,6 @@ package java.lang { 
    method public java.lang.StringBuffer insert(int, double);

    method public synchronized java.lang.StringBuffer replace(int, int, java.lang.String);

    method public synchronized java.lang.StringBuffer reverse();

    method public synchronized java.lang.String toString();

  }















  public final class StringBuilder extends java.lang.AbstractStringBuilder implements java.lang.Appendable java.lang.CharSequence java.io.Serializable {










@@ -51615,7 +51614,6 @@ package java.lang {













    method public java.lang.StringBuilder insert(int, double);















    method public java.lang.StringBuilder replace(int, int, java.lang.String);















    method public java.lang.StringBuilder reverse();













    method public java.lang.String toString();















  }





























  public class StringIndexOutOfBoundsException extends java.lang.IndexOutOfBoundsException {










@@ -51979,9 +51977,7 @@ package java.lang.reflect {













  }





























  public final class Constructor extends java.lang.reflect.AccessibleObject implements java.lang.reflect.GenericDeclaration java.lang.reflect.Member {













    method public boolean equals(java.lang.Object);















    method public A getAnnotation(java.lang.Class<A>);













    method public java.lang.annotation.Annotation[] getDeclaredAnnotations();















    method public java.lang.Class<T> getDeclaringClass();















    method public java.lang.Class<?>[] getExceptionTypes();















    method public java.lang.reflect.Type[] getGenericExceptionTypes();










@@ -52066,7 +52062,6 @@ package java.lang.reflect {













  }





























  public final class Method extends java.lang.reflect.AccessibleObject implements java.lang.reflect.GenericDeclaration java.lang.reflect.Member {













    method public boolean equals(java.lang.Object);















    method public A getAnnotation(java.lang.Class<A>);















    method public java.lang.Class<?> getDeclaringClass();















    method public java.lang.Object getDefaultValue();

























api/system-current.txt



+2
−7




























Original line number
Diff line number
Diff line








@@ -6606,9 +6606,9 @@ package android.app.job {













    method public long getInitialBackoffMillis();















    method public long getIntervalMillis();















    method public long getMaxExecutionDelayMillis();













    method public static final long getMinFlexMillis();















    method public long getMinLatencyMillis();













    method public static final long getMinimumFlex();













    method public static final long getMinimumPeriod();













    method public static final long getMinPeriodMillis();















    method public int getNetworkType();















    method public android.content.ComponentName getService();















    method public android.os.Bundle getTransientExtras();










@@ -54932,7 +54932,6 @@ package java.lang {













    method public java.lang.StringBuffer insert(int, double);















    method public synchronized java.lang.StringBuffer replace(int, int, java.lang.String);















    method public synchronized java.lang.StringBuffer reverse();













    method public synchronized java.lang.String toString();















  }





























  public final class StringBuilder extends java.lang.AbstractStringBuilder implements java.lang.Appendable java.lang.CharSequence java.io.Serializable {










@@ -54970,7 +54969,6 @@ package java.lang {













    method public java.lang.StringBuilder insert(int, double);















    method public java.lang.StringBuilder replace(int, int, java.lang.String);















    method public java.lang.StringBuilder reverse();













    method public java.lang.String toString();















  }





























  public class StringIndexOutOfBoundsException extends java.lang.IndexOutOfBoundsException {










@@ -55334,9 +55332,7 @@ package java.lang.reflect {













  }





























  public final class Constructor extends java.lang.reflect.AccessibleObject implements java.lang.reflect.GenericDeclaration java.lang.reflect.Member {













    method public boolean equals(java.lang.Object);















    method public A getAnnotation(java.lang.Class<A>);













    method public java.lang.annotation.Annotation[] getDeclaredAnnotations();















    method public java.lang.Class<T> getDeclaringClass();















    method public java.lang.Class<?>[] getExceptionTypes();















    method public java.lang.reflect.Type[] getGenericExceptionTypes();










@@ -55421,7 +55417,6 @@ package java.lang.reflect {













  }





























  public final class Method extends java.lang.reflect.AccessibleObject implements java.lang.reflect.GenericDeclaration java.lang.reflect.Member {













    method public boolean equals(java.lang.Object);















    method public A getAnnotation(java.lang.Class<A>);















    method public java.lang.Class<?> getDeclaringClass();















    method public java.lang.Object getDefaultValue();

























api/test-current.txt



+2
−7




























Original line number
Diff line number
Diff line








@@ -6331,9 +6331,9 @@ package android.app.job {













    method public long getInitialBackoffMillis();















    method public long getIntervalMillis();















    method public long getMaxExecutionDelayMillis();













    method public static final long getMinFlexMillis();















    method public long getMinLatencyMillis();













    method public static final long getMinimumFlex();













    method public static final long getMinimumPeriod();













    method public static final long getMinPeriodMillis();















    method public int getNetworkType();















    method public android.content.ComponentName getService();















    method public android.os.Bundle getTransientExtras();










@@ -51661,7 +51661,6 @@ package java.lang {













    method public java.lang.StringBuffer insert(int, double);















    method public synchronized java.lang.StringBuffer replace(int, int, java.lang.String);















    method public synchronized java.lang.StringBuffer reverse();













    method public synchronized java.lang.String toString();















  }





























  public final class StringBuilder extends java.lang.AbstractStringBuilder implements java.lang.Appendable java.lang.CharSequence java.io.Serializable {










@@ -51699,7 +51698,6 @@ package java.lang {













    method public java.lang.StringBuilder insert(int, double);















    method public java.lang.StringBuilder replace(int, int, java.lang.String);















    method public java.lang.StringBuilder reverse();













    method public java.lang.String toString();















  }





























  public class StringIndexOutOfBoundsException extends java.lang.IndexOutOfBoundsException {










@@ -52063,9 +52061,7 @@ package java.lang.reflect {













  }





























  public final class Constructor extends java.lang.reflect.AccessibleObject implements java.lang.reflect.GenericDeclaration java.lang.reflect.Member {













    method public boolean equals(java.lang.Object);















    method public A getAnnotation(java.lang.Class<A>);













    method public java.lang.annotation.Annotation[] getDeclaredAnnotations();















    method public java.lang.Class<T> getDeclaringClass();















    method public java.lang.Class<?>[] getExceptionTypes();















    method public java.lang.reflect.Type[] getGenericExceptionTypes();










@@ -52150,7 +52146,6 @@ package java.lang.reflect {













  }





























  public final class Method extends java.lang.reflect.AccessibleObject implements java.lang.reflect.GenericDeclaration java.lang.reflect.Member {













    method public boolean equals(java.lang.Object);















    method public A getAnnotation(java.lang.Class<A>);















    method public java.lang.Class<?> getDeclaringClass();















    method public java.lang.Object getDefaultValue();

























core/java/android/app/job/JobInfo.java



+6
−6




























Original line number
Diff line number
Diff line








@@ -89,7 +89,7 @@ public class JobInfo implements Parcelable {













     *















     * @return The minimum available interval for scheduling periodic jobs, in milliseconds.















     */













    public static final long getMinimumPeriod() {













    public static final long getMinPeriodMillis() {















        return MIN_PERIOD_MILLIS;















    }

























@@ -100,7 +100,7 @@ public class JobInfo implements Parcelable {













     *















     * @return The minimum available flex time for scheduling periodic jobs, in milliseconds.















     */













    public static final long getMinimumFlex() {













    public static final long getMinFlexMillis() {















        return MIN_FLEX_MILLIS;















    }


























@@ -316,7 +316,7 @@ public class JobInfo implements Parcelable {













     * job does not recur periodically.















     */















    public long getIntervalMillis() {













        return intervalMillis >= getMinimumPeriod() ? intervalMillis : getMinimumPeriod();













        return intervalMillis >= getMinPeriodMillis() ? intervalMillis : getMinPeriodMillis();















    }































    /**









@@ -326,7 +326,7 @@ public class JobInfo implements Parcelable {













    public long getFlexMillis() {















        long interval = getIntervalMillis();















        long percentClamp = 5 * interval / 100;













        long clampedFlex = Math.max(flexMillis, Math.max(percentClamp, getMinimumFlex()));













        long clampedFlex = Math.max(flexMillis, Math.max(percentClamp, getMinFlexMillis()));















        return clampedFlex <= interval ? clampedFlex : interval;















    }


























@@ -706,9 +706,9 @@ public class JobInfo implements Parcelable {













         * Specify that this job should recur with the provided interval and flex. The job can















         * execute at any time in a window of flex length at the end of the period.















         * @param intervalMillis Millisecond interval for which this job will repeat. A minimum













         *                       value of {@link #getMinimumPeriod()} is enforced.













         *                       value of {@link #getMinPeriodMillis()} is enforced.















         * @param flexMillis Millisecond flex for this job. Flex is clamped to be at least













         *                   {@link #getMinimumFlex()} or 5 percent of the period, whichever is













         *                   {@link #getMinFlexMillis()} or 5 percent of the period, whichever is















         *                   higher.















         */















        public Builder setPeriodic(long intervalMillis, long flexMillis) {