Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: c5bbf34cd9

* commit 'c5bbf34cd940f8fa62662bec3a71f7160983dc06':
  API feedback: rename JobInfo methods for clarity

Change-Id: I4b97e2f581ce0c36d1385a510916b4ad3bc4e1af
This commit is contained in:
Chris Tate
2016-05-19 00:03:45 +00:00
committed by android-build-merger
parent 44bc81e62d c5bbf34cd9
commit 4b8088ea8d
4 changed files with 12 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
api/current.txt
View File

@@ -6323,9 +6323,9 @@ package android.app.job {
method public long getInitialBackoffMillis(); method public long getInitialBackoffMillis();
method public long getIntervalMillis(); method public long getIntervalMillis();
method public long getMaxExecutionDelayMillis(); method public long getMaxExecutionDelayMillis();
method public static final long getMinFlexMillis();
method public long getMinLatencyMillis(); method public long getMinLatencyMillis();
method public static final long getMinimumFlex(); method public static final long getMinPeriodMillis();
method public static final long getMinimumPeriod();
method public int getNetworkType(); method public int getNetworkType();
method public android.content.ComponentName getService(); method public android.content.ComponentName getService();
method public long getTriggerContentMaxDelay(); method public long getTriggerContentMaxDelay();
@@ -51570,7 +51570,6 @@ package java.lang {
method public java.lang.StringBuffer insert(int, double); 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 replace(int, int, java.lang.String);
method public synchronized java.lang.StringBuffer reverse(); 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 { public final class StringBuilder extends java.lang.AbstractStringBuilder implements java.lang.Appendable java.lang.CharSequence java.io.Serializable {
@@ -51608,7 +51607,6 @@ package java.lang {
method public java.lang.StringBuilder insert(int, double); method public java.lang.StringBuilder insert(int, double);
method public java.lang.StringBuilder replace(int, int, java.lang.String); method public java.lang.StringBuilder replace(int, int, java.lang.String);
method public java.lang.StringBuilder reverse(); method public java.lang.StringBuilder reverse();
method public java.lang.String toString();
} }
public class StringIndexOutOfBoundsException extends java.lang.IndexOutOfBoundsException { public class StringIndexOutOfBoundsException extends java.lang.IndexOutOfBoundsException {
@@ -51972,9 +51970,7 @@ package java.lang.reflect {
} }
public final class Constructor extends java.lang.reflect.AccessibleObject implements java.lang.reflect.GenericDeclaration java.lang.reflect.Member { 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 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<T> getDeclaringClass();
method public java.lang.Class<?>[] getExceptionTypes(); method public java.lang.Class<?>[] getExceptionTypes();
method public java.lang.reflect.Type[] getGenericExceptionTypes(); method public java.lang.reflect.Type[] getGenericExceptionTypes();
@@ -52059,7 +52055,6 @@ package java.lang.reflect {
} }
public final class Method extends java.lang.reflect.AccessibleObject implements java.lang.reflect.GenericDeclaration java.lang.reflect.Member { 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 A getAnnotation(java.lang.Class<A>);
method public java.lang.Class<?> getDeclaringClass(); method public java.lang.Class<?> getDeclaringClass();
method public java.lang.Object getDefaultValue(); method public java.lang.Object getDefaultValue();

9
api/system-current.txt
View File

@@ -6604,9 +6604,9 @@ package android.app.job {
method public long getInitialBackoffMillis(); method public long getInitialBackoffMillis();
method public long getIntervalMillis(); method public long getIntervalMillis();
method public long getMaxExecutionDelayMillis(); method public long getMaxExecutionDelayMillis();
method public static final long getMinFlexMillis();
method public long getMinLatencyMillis(); method public long getMinLatencyMillis();
method public static final long getMinimumFlex(); method public static final long getMinPeriodMillis();
method public static final long getMinimumPeriod();
method public int getNetworkType(); method public int getNetworkType();
method public android.content.ComponentName getService(); method public android.content.ComponentName getService();
method public long getTriggerContentMaxDelay(); method public long getTriggerContentMaxDelay();
@@ -54925,7 +54925,6 @@ package java.lang {
method public java.lang.StringBuffer insert(int, double); 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 replace(int, int, java.lang.String);
method public synchronized java.lang.StringBuffer reverse(); 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 { public final class StringBuilder extends java.lang.AbstractStringBuilder implements java.lang.Appendable java.lang.CharSequence java.io.Serializable {
@@ -54963,7 +54962,6 @@ package java.lang {
method public java.lang.StringBuilder insert(int, double); method public java.lang.StringBuilder insert(int, double);
method public java.lang.StringBuilder replace(int, int, java.lang.String); method public java.lang.StringBuilder replace(int, int, java.lang.String);
method public java.lang.StringBuilder reverse(); method public java.lang.StringBuilder reverse();
method public java.lang.String toString();
} }
public class StringIndexOutOfBoundsException extends java.lang.IndexOutOfBoundsException { public class StringIndexOutOfBoundsException extends java.lang.IndexOutOfBoundsException {
@@ -55327,9 +55325,7 @@ package java.lang.reflect {
} }
public final class Constructor extends java.lang.reflect.AccessibleObject implements java.lang.reflect.GenericDeclaration java.lang.reflect.Member { 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 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<T> getDeclaringClass();
method public java.lang.Class<?>[] getExceptionTypes(); method public java.lang.Class<?>[] getExceptionTypes();
method public java.lang.reflect.Type[] getGenericExceptionTypes(); method public java.lang.reflect.Type[] getGenericExceptionTypes();
@@ -55414,7 +55410,6 @@ package java.lang.reflect {
} }
public final class Method extends java.lang.reflect.AccessibleObject implements java.lang.reflect.GenericDeclaration java.lang.reflect.Member { 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 A getAnnotation(java.lang.Class<A>);
method public java.lang.Class<?> getDeclaringClass(); method public java.lang.Class<?> getDeclaringClass();
method public java.lang.Object getDefaultValue(); method public java.lang.Object getDefaultValue();

9
api/test-current.txt
View File

@@ -6329,9 +6329,9 @@ package android.app.job {
method public long getInitialBackoffMillis(); method public long getInitialBackoffMillis();
method public long getIntervalMillis(); method public long getIntervalMillis();
method public long getMaxExecutionDelayMillis(); method public long getMaxExecutionDelayMillis();
method public static final long getMinFlexMillis();
method public long getMinLatencyMillis(); method public long getMinLatencyMillis();
method public static final long getMinimumFlex(); method public static final long getMinPeriodMillis();
method public static final long getMinimumPeriod();
method public int getNetworkType(); method public int getNetworkType();
method public android.content.ComponentName getService(); method public android.content.ComponentName getService();
method public long getTriggerContentMaxDelay(); method public long getTriggerContentMaxDelay();
@@ -51651,7 +51651,6 @@ package java.lang {
method public java.lang.StringBuffer insert(int, double); 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 replace(int, int, java.lang.String);
method public synchronized java.lang.StringBuffer reverse(); 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 { public final class StringBuilder extends java.lang.AbstractStringBuilder implements java.lang.Appendable java.lang.CharSequence java.io.Serializable {
@@ -51689,7 +51688,6 @@ package java.lang {
method public java.lang.StringBuilder insert(int, double); method public java.lang.StringBuilder insert(int, double);
method public java.lang.StringBuilder replace(int, int, java.lang.String); method public java.lang.StringBuilder replace(int, int, java.lang.String);
method public java.lang.StringBuilder reverse(); method public java.lang.StringBuilder reverse();
method public java.lang.String toString();
} }
public class StringIndexOutOfBoundsException extends java.lang.IndexOutOfBoundsException { public class StringIndexOutOfBoundsException extends java.lang.IndexOutOfBoundsException {
@@ -52053,9 +52051,7 @@ package java.lang.reflect {
} }
public final class Constructor extends java.lang.reflect.AccessibleObject implements java.lang.reflect.GenericDeclaration java.lang.reflect.Member { 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 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<T> getDeclaringClass();
method public java.lang.Class<?>[] getExceptionTypes(); method public java.lang.Class<?>[] getExceptionTypes();
method public java.lang.reflect.Type[] getGenericExceptionTypes(); method public java.lang.reflect.Type[] getGenericExceptionTypes();
@@ -52140,7 +52136,6 @@ package java.lang.reflect {
} }
public final class Method extends java.lang.reflect.AccessibleObject implements java.lang.reflect.GenericDeclaration java.lang.reflect.Member { 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 A getAnnotation(java.lang.Class<A>);
method public java.lang.Class<?> getDeclaringClass(); method public java.lang.Class<?> getDeclaringClass();
method public java.lang.Object getDefaultValue(); method public java.lang.Object getDefaultValue();

12
core/java/android/app/job/JobInfo.java
View File

@@ -88,7 +88,7 @@ public class JobInfo implements Parcelable {
* *
* @return The minimum available interval for scheduling periodic jobs, in milliseconds. * @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; return MIN_PERIOD_MILLIS;
} }
@@ -99,7 +99,7 @@ public class JobInfo implements Parcelable {
* *
* @return The minimum available flex time for scheduling periodic jobs, in milliseconds. * @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; return MIN_FLEX_MILLIS;
} }
@@ -306,7 +306,7 @@ public class JobInfo implements Parcelable {
* job does not recur periodically. * job does not recur periodically.
*/ */
public long getIntervalMillis() { public long getIntervalMillis() {
return intervalMillis >= getMinimumPeriod() ? intervalMillis : getMinimumPeriod(); return intervalMillis >= getMinPeriodMillis() ? intervalMillis : getMinPeriodMillis();
} }
/** /**
@@ -316,7 +316,7 @@ public class JobInfo implements Parcelable {
public long getFlexMillis() { public long getFlexMillis() {
long interval = getIntervalMillis(); long interval = getIntervalMillis();
long percentClamp = 5 * interval / 100; 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; return clampedFlex <= interval ? clampedFlex : interval;
} }
@@ -682,9 +682,9 @@ public class JobInfo implements Parcelable {
* Specify that this job should recur with the provided interval and flex. The job can * 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. * 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 * @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 * @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. * higher.
*/ */
public Builder setPeriodic(long intervalMillis, long flexMillis) { public Builder setPeriodic(long intervalMillis, long flexMillis) {