Merge "Extend JobInfo to support NetworkRequest." (29862ccd) · Commits · e / os / android_frameworks_base

api/current.txt

+27 −2

Original line number	Diff line number	Diff line
		@@ -6847,7 +6847,8 @@ package android.app.job {
		method public static final long getMinFlexMillis();
		method public long getMinLatencyMillis();
		method public static final long getMinPeriodMillis();
		method public int getNetworkType();
		method public deprecated int getNetworkType();
		method public android.net.NetworkRequest getRequiredNetwork();
		method public android.content.ComponentName getService();
		method public android.os.Bundle getTransientExtras();
		method public long getTriggerContentMaxDelay();
		@@ -6867,7 +6868,8 @@ package android.app.job {
		field public static final long MAX_BACKOFF_DELAY_MILLIS = 18000000L; // 0x112a880L
		field public static final int NETWORK_BYTES_UNKNOWN = -1; // 0xffffffff
		field public static final int NETWORK_TYPE_ANY = 1; // 0x1
		field public static final int NETWORK_TYPE_METERED = 4; // 0x4
		field public static final int NETWORK_TYPE_CELLULAR = 4; // 0x4
		field public static final deprecated int NETWORK_TYPE_METERED = 4; // 0x4
		field public static final int NETWORK_TYPE_NONE = 0; // 0x0
		field public static final int NETWORK_TYPE_NOT_ROAMING = 3; // 0x3
		field public static final int NETWORK_TYPE_UNMETERED = 2; // 0x2
		@@ -6886,6 +6888,7 @@ package android.app.job {
		method public android.app.job.JobInfo.Builder setPeriodic(long);
		method public android.app.job.JobInfo.Builder setPeriodic(long, long);
		method public android.app.job.JobInfo.Builder setPersisted(boolean);
		method public android.app.job.JobInfo.Builder setRequiredNetwork(android.net.NetworkRequest);
		method public android.app.job.JobInfo.Builder setRequiredNetworkType(int);
		method public android.app.job.JobInfo.Builder setRequiresBatteryNotLow(boolean);
		method public android.app.job.JobInfo.Builder setRequiresCharging(boolean);
		@@ -18273,11 +18276,13 @@ package android.icu.text {
		method public synchronized void applyLocalizedPattern(java.lang.String);
		method public synchronized void applyPattern(java.lang.String);
		method public synchronized boolean areSignificantDigitsUsed();
		method public synchronized boolean equals(java.lang.Object);
		method public java.lang.StringBuffer format(double, java.lang.StringBuffer, java.text.FieldPosition);
		method public java.lang.StringBuffer format(long, java.lang.StringBuffer, java.text.FieldPosition);
		method public java.lang.StringBuffer format(java.math.BigInteger, java.lang.StringBuffer, java.text.FieldPosition);
		method public java.lang.StringBuffer format(java.math.BigDecimal, java.lang.StringBuffer, java.text.FieldPosition);
		method public java.lang.StringBuffer format(android.icu.math.BigDecimal, java.lang.StringBuffer, java.text.FieldPosition);
		method public synchronized android.icu.util.Currency getCurrency();
		method public synchronized android.icu.text.CurrencyPluralInfo getCurrencyPluralInfo();
		method public synchronized android.icu.util.Currency.CurrencyUsage getCurrencyUsage();
		method public synchronized android.icu.text.DecimalFormatSymbols getDecimalFormatSymbols();
		@@ -18285,8 +18290,12 @@ package android.icu.text {
		method public synchronized int getGroupingSize();
		method public synchronized java.math.MathContext getMathContext();
		method public synchronized android.icu.math.MathContext getMathContextICU();
		method public synchronized int getMaximumFractionDigits();
		method public synchronized int getMaximumIntegerDigits();
		method public synchronized int getMaximumSignificantDigits();
		method public synchronized byte getMinimumExponentDigits();
		method public synchronized int getMinimumFractionDigits();
		method public synchronized int getMinimumIntegerDigits();
		method public synchronized int getMinimumSignificantDigits();
		method public synchronized int getMultiplier();
		method public synchronized java.lang.String getNegativePrefix();
		@@ -18297,13 +18306,19 @@ package android.icu.text {
		method public synchronized java.lang.String getPositivePrefix();
		method public synchronized java.lang.String getPositiveSuffix();
		method public synchronized java.math.BigDecimal getRoundingIncrement();
		method public synchronized int getRoundingMode();
		method public synchronized int getSecondaryGroupingSize();
		method public synchronized int hashCode();
		method public synchronized boolean isDecimalPatternMatchRequired();
		method public synchronized boolean isDecimalSeparatorAlwaysShown();
		method public synchronized boolean isExponentSignAlwaysShown();
		method public synchronized boolean isGroupingUsed();
		method public synchronized boolean isParseBigDecimal();
		method public synchronized boolean isParseIntegerOnly();
		method public synchronized boolean isParseStrict();
		method public synchronized boolean isScientificNotation();
		method public java.lang.Number parse(java.lang.String, java.text.ParsePosition);
		method public synchronized void setCurrency(android.icu.util.Currency);
		method public synchronized void setCurrencyPluralInfo(android.icu.text.CurrencyPluralInfo);
		method public synchronized void setCurrencyUsage(android.icu.util.Currency.CurrencyUsage);
		method public synchronized void setDecimalFormatSymbols(android.icu.text.DecimalFormatSymbols);
		@@ -18312,10 +18327,15 @@ package android.icu.text {
		method public synchronized void setExponentSignAlwaysShown(boolean);
		method public synchronized void setFormatWidth(int);
		method public synchronized void setGroupingSize(int);
		method public synchronized void setGroupingUsed(boolean);
		method public synchronized void setMathContext(java.math.MathContext);
		method public synchronized void setMathContextICU(android.icu.math.MathContext);
		method public synchronized void setMaximumFractionDigits(int);
		method public synchronized void setMaximumIntegerDigits(int);
		method public synchronized void setMaximumSignificantDigits(int);
		method public synchronized void setMinimumExponentDigits(byte);
		method public synchronized void setMinimumFractionDigits(int);
		method public synchronized void setMinimumIntegerDigits(int);
		method public synchronized void setMinimumSignificantDigits(int);
		method public synchronized void setMultiplier(int);
		method public synchronized void setNegativePrefix(java.lang.String);
		@@ -18323,12 +18343,15 @@ package android.icu.text {
		method public synchronized void setPadCharacter(char);
		method public synchronized void setPadPosition(int);
		method public synchronized void setParseBigDecimal(boolean);
		method public synchronized void setParseIntegerOnly(boolean);
		method public deprecated void setParseMaxDigits(int);
		method public synchronized void setParseStrict(boolean);
		method public synchronized void setPositivePrefix(java.lang.String);
		method public synchronized void setPositiveSuffix(java.lang.String);
		method public synchronized void setRoundingIncrement(java.math.BigDecimal);
		method public synchronized void setRoundingIncrement(android.icu.math.BigDecimal);
		method public synchronized void setRoundingIncrement(double);
		method public synchronized void setRoundingMode(int);
		method public synchronized void setScientificNotation(boolean);
		method public synchronized void setSecondaryGroupingSize(int);
		method public synchronized void setSignificantDigitsUsed(boolean);
		@@ -31875,10 +31898,12 @@ package android.os {
		public final class SystemClock {
		method public static long currentThreadTimeMillis();
		method public static long elapsedRealtime();
		method public static java.time.Clock elapsedRealtimeClock();
		method public static long elapsedRealtimeNanos();
		method public static boolean setCurrentTimeMillis(long);
		method public static void sleep(long);
		method public static long uptimeMillis();
		method public static java.time.Clock uptimeMillisClock();
		}

		public class TestLooperManager {

api/system-current.txt

+27 −2

Original line number	Diff line number	Diff line
		@@ -7290,7 +7290,8 @@ package android.app.job {
		method public static final long getMinFlexMillis();
		method public long getMinLatencyMillis();
		method public static final long getMinPeriodMillis();
		method public int getNetworkType();
		method public deprecated int getNetworkType();
		method public android.net.NetworkRequest getRequiredNetwork();
		method public android.content.ComponentName getService();
		method public android.os.Bundle getTransientExtras();
		method public long getTriggerContentMaxDelay();
		@@ -7310,7 +7311,8 @@ package android.app.job {
		field public static final long MAX_BACKOFF_DELAY_MILLIS = 18000000L; // 0x112a880L
		field public static final int NETWORK_BYTES_UNKNOWN = -1; // 0xffffffff
		field public static final int NETWORK_TYPE_ANY = 1; // 0x1
		field public static final int NETWORK_TYPE_METERED = 4; // 0x4
		field public static final int NETWORK_TYPE_CELLULAR = 4; // 0x4
		field public static final deprecated int NETWORK_TYPE_METERED = 4; // 0x4
		field public static final int NETWORK_TYPE_NONE = 0; // 0x0
		field public static final int NETWORK_TYPE_NOT_ROAMING = 3; // 0x3
		field public static final int NETWORK_TYPE_UNMETERED = 2; // 0x2
		@@ -7329,6 +7331,7 @@ package android.app.job {
		method public android.app.job.JobInfo.Builder setPeriodic(long);
		method public android.app.job.JobInfo.Builder setPeriodic(long, long);
		method public android.app.job.JobInfo.Builder setPersisted(boolean);
		method public android.app.job.JobInfo.Builder setRequiredNetwork(android.net.NetworkRequest);
		method public android.app.job.JobInfo.Builder setRequiredNetworkType(int);
		method public android.app.job.JobInfo.Builder setRequiresBatteryNotLow(boolean);
		method public android.app.job.JobInfo.Builder setRequiresCharging(boolean);
		@@ -19832,11 +19835,13 @@ package android.icu.text {
		method public synchronized void applyLocalizedPattern(java.lang.String);
		method public synchronized void applyPattern(java.lang.String);
		method public synchronized boolean areSignificantDigitsUsed();
		method public synchronized boolean equals(java.lang.Object);
		method public java.lang.StringBuffer format(double, java.lang.StringBuffer, java.text.FieldPosition);
		method public java.lang.StringBuffer format(long, java.lang.StringBuffer, java.text.FieldPosition);
		method public java.lang.StringBuffer format(java.math.BigInteger, java.lang.StringBuffer, java.text.FieldPosition);
		method public java.lang.StringBuffer format(java.math.BigDecimal, java.lang.StringBuffer, java.text.FieldPosition);
		method public java.lang.StringBuffer format(android.icu.math.BigDecimal, java.lang.StringBuffer, java.text.FieldPosition);
		method public synchronized android.icu.util.Currency getCurrency();
		method public synchronized android.icu.text.CurrencyPluralInfo getCurrencyPluralInfo();
		method public synchronized android.icu.util.Currency.CurrencyUsage getCurrencyUsage();
		method public synchronized android.icu.text.DecimalFormatSymbols getDecimalFormatSymbols();
		@@ -19844,8 +19849,12 @@ package android.icu.text {
		method public synchronized int getGroupingSize();
		method public synchronized java.math.MathContext getMathContext();
		method public synchronized android.icu.math.MathContext getMathContextICU();
		method public synchronized int getMaximumFractionDigits();
		method public synchronized int getMaximumIntegerDigits();
		method public synchronized int getMaximumSignificantDigits();
		method public synchronized byte getMinimumExponentDigits();
		method public synchronized int getMinimumFractionDigits();
		method public synchronized int getMinimumIntegerDigits();
		method public synchronized int getMinimumSignificantDigits();
		method public synchronized int getMultiplier();
		method public synchronized java.lang.String getNegativePrefix();
		@@ -19856,13 +19865,19 @@ package android.icu.text {
		method public synchronized java.lang.String getPositivePrefix();
		method public synchronized java.lang.String getPositiveSuffix();
		method public synchronized java.math.BigDecimal getRoundingIncrement();
		method public synchronized int getRoundingMode();
		method public synchronized int getSecondaryGroupingSize();
		method public synchronized int hashCode();
		method public synchronized boolean isDecimalPatternMatchRequired();
		method public synchronized boolean isDecimalSeparatorAlwaysShown();
		method public synchronized boolean isExponentSignAlwaysShown();
		method public synchronized boolean isGroupingUsed();
		method public synchronized boolean isParseBigDecimal();
		method public synchronized boolean isParseIntegerOnly();
		method public synchronized boolean isParseStrict();
		method public synchronized boolean isScientificNotation();
		method public java.lang.Number parse(java.lang.String, java.text.ParsePosition);
		method public synchronized void setCurrency(android.icu.util.Currency);
		method public synchronized void setCurrencyPluralInfo(android.icu.text.CurrencyPluralInfo);
		method public synchronized void setCurrencyUsage(android.icu.util.Currency.CurrencyUsage);
		method public synchronized void setDecimalFormatSymbols(android.icu.text.DecimalFormatSymbols);
		@@ -19871,10 +19886,15 @@ package android.icu.text {
		method public synchronized void setExponentSignAlwaysShown(boolean);
		method public synchronized void setFormatWidth(int);
		method public synchronized void setGroupingSize(int);
		method public synchronized void setGroupingUsed(boolean);
		method public synchronized void setMathContext(java.math.MathContext);
		method public synchronized void setMathContextICU(android.icu.math.MathContext);
		method public synchronized void setMaximumFractionDigits(int);
		method public synchronized void setMaximumIntegerDigits(int);
		method public synchronized void setMaximumSignificantDigits(int);
		method public synchronized void setMinimumExponentDigits(byte);
		method public synchronized void setMinimumFractionDigits(int);
		method public synchronized void setMinimumIntegerDigits(int);
		method public synchronized void setMinimumSignificantDigits(int);
		method public synchronized void setMultiplier(int);
		method public synchronized void setNegativePrefix(java.lang.String);
		@@ -19882,12 +19902,15 @@ package android.icu.text {
		method public synchronized void setPadCharacter(char);
		method public synchronized void setPadPosition(int);
		method public synchronized void setParseBigDecimal(boolean);
		method public synchronized void setParseIntegerOnly(boolean);
		method public deprecated void setParseMaxDigits(int);
		method public synchronized void setParseStrict(boolean);
		method public synchronized void setPositivePrefix(java.lang.String);
		method public synchronized void setPositiveSuffix(java.lang.String);
		method public synchronized void setRoundingIncrement(java.math.BigDecimal);
		method public synchronized void setRoundingIncrement(android.icu.math.BigDecimal);
		method public synchronized void setRoundingIncrement(double);
		method public synchronized void setRoundingMode(int);
		method public synchronized void setScientificNotation(boolean);
		method public synchronized void setSecondaryGroupingSize(int);
		method public synchronized void setSignificantDigitsUsed(boolean);
		@@ -34664,10 +34687,12 @@ package android.os {
		public final class SystemClock {
		method public static long currentThreadTimeMillis();
		method public static long elapsedRealtime();
		method public static java.time.Clock elapsedRealtimeClock();
		method public static long elapsedRealtimeNanos();
		method public static boolean setCurrentTimeMillis(long);
		method public static void sleep(long);
		method public static long uptimeMillis();
		method public static java.time.Clock uptimeMillisClock();
		}

		public class TestLooperManager {

api/test-current.txt

+27 −2

Original line number	Diff line number	Diff line
		@@ -6921,7 +6921,8 @@ package android.app.job {
		method public static final long getMinFlexMillis();
		method public long getMinLatencyMillis();
		method public static final long getMinPeriodMillis();
		method public int getNetworkType();
		method public deprecated int getNetworkType();
		method public android.net.NetworkRequest getRequiredNetwork();
		method public android.content.ComponentName getService();
		method public android.os.Bundle getTransientExtras();
		method public long getTriggerContentMaxDelay();
		@@ -6941,7 +6942,8 @@ package android.app.job {
		field public static final long MAX_BACKOFF_DELAY_MILLIS = 18000000L; // 0x112a880L
		field public static final int NETWORK_BYTES_UNKNOWN = -1; // 0xffffffff
		field public static final int NETWORK_TYPE_ANY = 1; // 0x1
		field public static final int NETWORK_TYPE_METERED = 4; // 0x4
		field public static final int NETWORK_TYPE_CELLULAR = 4; // 0x4
		field public static final deprecated int NETWORK_TYPE_METERED = 4; // 0x4
		field public static final int NETWORK_TYPE_NONE = 0; // 0x0
		field public static final int NETWORK_TYPE_NOT_ROAMING = 3; // 0x3
		field public static final int NETWORK_TYPE_UNMETERED = 2; // 0x2
		@@ -6960,6 +6962,7 @@ package android.app.job {
		method public android.app.job.JobInfo.Builder setPeriodic(long);
		method public android.app.job.JobInfo.Builder setPeriodic(long, long);
		method public android.app.job.JobInfo.Builder setPersisted(boolean);
		method public android.app.job.JobInfo.Builder setRequiredNetwork(android.net.NetworkRequest);
		method public android.app.job.JobInfo.Builder setRequiredNetworkType(int);
		method public android.app.job.JobInfo.Builder setRequiresBatteryNotLow(boolean);
		method public android.app.job.JobInfo.Builder setRequiresCharging(boolean);
		@@ -18419,11 +18422,13 @@ package android.icu.text {
		method public synchronized void applyLocalizedPattern(java.lang.String);
		method public synchronized void applyPattern(java.lang.String);
		method public synchronized boolean areSignificantDigitsUsed();
		method public synchronized boolean equals(java.lang.Object);
		method public java.lang.StringBuffer format(double, java.lang.StringBuffer, java.text.FieldPosition);
		method public java.lang.StringBuffer format(long, java.lang.StringBuffer, java.text.FieldPosition);
		method public java.lang.StringBuffer format(java.math.BigInteger, java.lang.StringBuffer, java.text.FieldPosition);
		method public java.lang.StringBuffer format(java.math.BigDecimal, java.lang.StringBuffer, java.text.FieldPosition);
		method public java.lang.StringBuffer format(android.icu.math.BigDecimal, java.lang.StringBuffer, java.text.FieldPosition);
		method public synchronized android.icu.util.Currency getCurrency();
		method public synchronized android.icu.text.CurrencyPluralInfo getCurrencyPluralInfo();
		method public synchronized android.icu.util.Currency.CurrencyUsage getCurrencyUsage();
		method public synchronized android.icu.text.DecimalFormatSymbols getDecimalFormatSymbols();
		@@ -18431,8 +18436,12 @@ package android.icu.text {
		method public synchronized int getGroupingSize();
		method public synchronized java.math.MathContext getMathContext();
		method public synchronized android.icu.math.MathContext getMathContextICU();
		method public synchronized int getMaximumFractionDigits();
		method public synchronized int getMaximumIntegerDigits();
		method public synchronized int getMaximumSignificantDigits();
		method public synchronized byte getMinimumExponentDigits();
		method public synchronized int getMinimumFractionDigits();
		method public synchronized int getMinimumIntegerDigits();
		method public synchronized int getMinimumSignificantDigits();
		method public synchronized int getMultiplier();
		method public synchronized java.lang.String getNegativePrefix();
		@@ -18443,13 +18452,19 @@ package android.icu.text {
		method public synchronized java.lang.String getPositivePrefix();
		method public synchronized java.lang.String getPositiveSuffix();
		method public synchronized java.math.BigDecimal getRoundingIncrement();
		method public synchronized int getRoundingMode();
		method public synchronized int getSecondaryGroupingSize();
		method public synchronized int hashCode();
		method public synchronized boolean isDecimalPatternMatchRequired();
		method public synchronized boolean isDecimalSeparatorAlwaysShown();
		method public synchronized boolean isExponentSignAlwaysShown();
		method public synchronized boolean isGroupingUsed();
		method public synchronized boolean isParseBigDecimal();
		method public synchronized boolean isParseIntegerOnly();
		method public synchronized boolean isParseStrict();
		method public synchronized boolean isScientificNotation();
		method public java.lang.Number parse(java.lang.String, java.text.ParsePosition);
		method public synchronized void setCurrency(android.icu.util.Currency);
		method public synchronized void setCurrencyPluralInfo(android.icu.text.CurrencyPluralInfo);
		method public synchronized void setCurrencyUsage(android.icu.util.Currency.CurrencyUsage);
		method public synchronized void setDecimalFormatSymbols(android.icu.text.DecimalFormatSymbols);
		@@ -18458,10 +18473,15 @@ package android.icu.text {
		method public synchronized void setExponentSignAlwaysShown(boolean);
		method public synchronized void setFormatWidth(int);
		method public synchronized void setGroupingSize(int);
		method public synchronized void setGroupingUsed(boolean);
		method public synchronized void setMathContext(java.math.MathContext);
		method public synchronized void setMathContextICU(android.icu.math.MathContext);
		method public synchronized void setMaximumFractionDigits(int);
		method public synchronized void setMaximumIntegerDigits(int);
		method public synchronized void setMaximumSignificantDigits(int);
		method public synchronized void setMinimumExponentDigits(byte);
		method public synchronized void setMinimumFractionDigits(int);
		method public synchronized void setMinimumIntegerDigits(int);
		method public synchronized void setMinimumSignificantDigits(int);
		method public synchronized void setMultiplier(int);
		method public synchronized void setNegativePrefix(java.lang.String);
		@@ -18469,12 +18489,15 @@ package android.icu.text {
		method public synchronized void setPadCharacter(char);
		method public synchronized void setPadPosition(int);
		method public synchronized void setParseBigDecimal(boolean);
		method public synchronized void setParseIntegerOnly(boolean);
		method public deprecated void setParseMaxDigits(int);
		method public synchronized void setParseStrict(boolean);
		method public synchronized void setPositivePrefix(java.lang.String);
		method public synchronized void setPositiveSuffix(java.lang.String);
		method public synchronized void setRoundingIncrement(java.math.BigDecimal);
		method public synchronized void setRoundingIncrement(android.icu.math.BigDecimal);
		method public synchronized void setRoundingIncrement(double);
		method public synchronized void setRoundingMode(int);
		method public synchronized void setScientificNotation(boolean);
		method public synchronized void setSecondaryGroupingSize(int);
		method public synchronized void setSignificantDigitsUsed(boolean);
		@@ -32141,10 +32164,12 @@ package android.os {
		public final class SystemClock {
		method public static long currentThreadTimeMillis();
		method public static long elapsedRealtime();
		method public static java.time.Clock elapsedRealtimeClock();
		method public static long elapsedRealtimeNanos();
		method public static boolean setCurrentTimeMillis(long);
		method public static void sleep(long);
		method public static long uptimeMillis();
		method public static java.time.Clock uptimeMillisClock();
		}

		public class TestLooperManager {

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

+174 −55

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/os/SystemClock.java

+56 −0

Original line number	Diff line number	Diff line
		@@ -16,12 +16,18 @@

		package android.os;

		import android.annotation.NonNull;
		import android.app.IAlarmManager;
		import android.content.Context;
		import android.util.Slog;

		import dalvik.annotation.optimization.CriticalNative;

		import java.time.Clock;
		import java.time.Instant;
		import java.time.ZoneId;
		import java.time.ZoneOffset;

		/**
		* Core timekeeping facilities.
		*
		@@ -167,6 +173,31 @@ public final class SystemClock {
		@CriticalNative
		native public static long uptimeMillis();

		/**
		* Return {@link Clock} that starts at system boot, not counting time spent
		* in deep sleep.
		*/
		public static @NonNull Clock uptimeMillisClock() {
		return new Clock() {
		@Override
		public ZoneId getZone() {
		return ZoneOffset.UTC;
		}
		@Override
		public Clock withZone(ZoneId zone) {
		throw new UnsupportedOperationException();
		}
		@Override
		public long millis() {
		return SystemClock.uptimeMillis();
		}
		@Override
		public Instant instant() {
		return Instant.ofEpochMilli(millis());
		}
		};
		}

		/**
		* Returns milliseconds since boot, including time spent in sleep.
		*
		@@ -175,6 +206,31 @@ public final class SystemClock {
		@CriticalNative
		native public static long elapsedRealtime();

		/**
		* Return {@link Clock} that starts at system boot, including time spent in
		* sleep.
		*/
		public static @NonNull Clock elapsedRealtimeClock() {
		return new Clock() {
		@Override
		public ZoneId getZone() {
		return ZoneOffset.UTC;
		}
		@Override
		public Clock withZone(ZoneId zone) {
		throw new UnsupportedOperationException();
		}
		@Override
		public long millis() {
		return SystemClock.elapsedRealtime();
		}
		@Override
		public Instant instant() {
		return Instant.ofEpochMilli(millis());
		}
		};
		}

		/**
		* Returns nanoseconds since boot, including time spent in sleep.
		*