Merge "Reject invalid input." (e6bdef02) · Commits · e / os / android_frameworks_base

apex/jobscheduler/framework/java/android/app/job/JobInfo.java

+10 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1250,6 +1250,11 @@ public class JobInfo implements Parcelable {
	*/		*/
	public Builder setEstimatedNetworkBytes(@BytesLong long downloadBytes,		public Builder setEstimatedNetworkBytes(@BytesLong long downloadBytes,
	@BytesLong long uploadBytes) {		@BytesLong long uploadBytes) {
			if ((downloadBytes != NETWORK_BYTES_UNKNOWN && downloadBytes < 0)
			\|\| (uploadBytes != NETWORK_BYTES_UNKNOWN && uploadBytes < 0)) {
			throw new IllegalArgumentException(
			"Can't provide negative estimated network usage");
			}
	mNetworkDownloadBytes = downloadBytes;		mNetworkDownloadBytes = downloadBytes;
	mNetworkUploadBytes = uploadBytes;		mNetworkUploadBytes = uploadBytes;
	return this;		return this;
	@@ -1647,12 +1652,16 @@ public class JobInfo implements Parcelable {
	/**		/**
	* @hide		* @hide
	*/		*/
	public void enforceValidity() {		public final void enforceValidity() {
	// Check that network estimates require network type		// Check that network estimates require network type
	if ((networkDownloadBytes > 0 \|\| networkUploadBytes > 0) && networkRequest == null) {		if ((networkDownloadBytes > 0 \|\| networkUploadBytes > 0) && networkRequest == null) {
	throw new IllegalArgumentException(		throw new IllegalArgumentException(
	"Can't provide estimated network usage without requiring a network");		"Can't provide estimated network usage without requiring a network");
	}		}
			if ((networkDownloadBytes != NETWORK_BYTES_UNKNOWN && networkDownloadBytes < 0)
			\|\| (networkUploadBytes != NETWORK_BYTES_UNKNOWN && networkUploadBytes < 0)) {
			throw new IllegalArgumentException("Can't provide negative estimated network usage");
			}

	// Check that a deadline was not set on a periodic job.		// Check that a deadline was not set on a periodic job.
	if (isPeriodic) {		if (isPeriodic) {

apex/jobscheduler/framework/java/android/app/job/JobWorkItem.java

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -68,6 +68,10 @@ final public class JobWorkItem implements Parcelable {
	* uploaded by this job work item, in bytes.		* uploaded by this job work item, in bytes.
	*/		*/
	public JobWorkItem(Intent intent, @BytesLong long downloadBytes, @BytesLong long uploadBytes) {		public JobWorkItem(Intent intent, @BytesLong long downloadBytes, @BytesLong long uploadBytes) {
			if ((downloadBytes != NETWORK_BYTES_UNKNOWN && downloadBytes < 0)
			\|\| (uploadBytes != NETWORK_BYTES_UNKNOWN && uploadBytes < 0)) {
			throw new IllegalArgumentException("Can't provide negative estimated network usage");
			}
	mIntent = intent;		mIntent = intent;
	mNetworkDownloadBytes = downloadBytes;		mNetworkDownloadBytes = downloadBytes;
	mNetworkUploadBytes = uploadBytes;		mNetworkUploadBytes = uploadBytes;