From c13e3155f0fc3480364c1ef3162c2b159fb634a5 Mon Sep 17 00:00:00 2001
From: Kweku Adams <kwekua@google.com>
Date: Fri, 25 Jun 2021 21:08:32 +0000
Subject: [PATCH] Revert "Reject invalid input."

Revert "Ensure that apps don't provide negative estimated byte u..."

Revert submission 15068553-js_lockdown

Reason for revert: 192016730
Reverted Changes:
I66485040d:Reject invalid input.
Ic35ee95bf:Ensure that apps don't provide negative estimated ...

Change-Id: Ic6778871528e67f9d01d7c299cfa535fad672878
---
 .../framework/java/android/app/job/JobInfo.java       | 11 +----------
 .../framework/java/android/app/job/JobWorkItem.java   |  4 ----
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/apex/jobscheduler/framework/java/android/app/job/JobInfo.java b/apex/jobscheduler/framework/java/android/app/job/JobInfo.java
index 9ab0ad5e5d5eb..144536ec2644d 100644
--- a/apex/jobscheduler/framework/java/android/app/job/JobInfo.java
+++ b/apex/jobscheduler/framework/java/android/app/job/JobInfo.java
@@ -1250,11 +1250,6 @@ public class JobInfo implements Parcelable {
          */
         public Builder setEstimatedNetworkBytes(@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");
-            }
             mNetworkDownloadBytes = downloadBytes;
             mNetworkUploadBytes = uploadBytes;
             return this;
@@ -1652,16 +1647,12 @@ public class JobInfo implements Parcelable {
     /**
      * @hide
      */
-    public final void enforceValidity() {
+    public void enforceValidity() {
         // Check that network estimates require network type
         if ((networkDownloadBytes > 0 || networkUploadBytes > 0) && networkRequest == null) {
             throw new IllegalArgumentException(
                     "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.
         if (isPeriodic) {
diff --git a/apex/jobscheduler/framework/java/android/app/job/JobWorkItem.java b/apex/jobscheduler/framework/java/android/app/job/JobWorkItem.java
index c6d366f675a50..0c45cbf6dc114 100644
--- a/apex/jobscheduler/framework/java/android/app/job/JobWorkItem.java
+++ b/apex/jobscheduler/framework/java/android/app/job/JobWorkItem.java
@@ -68,10 +68,6 @@ final public class JobWorkItem implements Parcelable {
      *            uploaded by this job work item, in bytes.
      */
     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;
         mNetworkDownloadBytes = downloadBytes;
         mNetworkUploadBytes = uploadBytes;