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

Commit fe177f2b authored by Daniele Di Proietto's avatar Daniele Di Proietto Committed by Android (Google) Code Review
Browse files

Revert "Handle negative delays and deadlines." 

Revert submission 26190262-js_block_negative_deadlines

Reason for revert: b/324845571

Reverted changes: /q/submissionid:26190262-js_block_negative_deadlines

Change-Id: Ifabc2d25ffa9af844548d91d3d0c5d082716c70a
parent 9c9e8d6b

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

+8 −45
Original line number Diff line number Diff line
@@ -124,15 +124,6 @@ public class JobInfo implements Parcelable { 
    @Overridable // Aid in testing

    public static final long ENFORCE_MINIMUM_TIME_WINDOWS = 311402873L;



    /**

     * Require that minimum latencies and override deadlines are nonnegative.

     *

     * @hide

     */

    @ChangeId

    @EnabledAfter(targetSdkVersion = Build.VERSION_CODES.UPSIDE_DOWN_CAKE)

    public static final long REJECT_NEGATIVE_DELAYS_AND_DEADLINES = 323349338L;



    /** @hide */

    @IntDef(prefix = { "NETWORK_TYPE_" }, value = {

            NETWORK_TYPE_NONE,
@@ -701,14 +692,14 @@ public class JobInfo implements Parcelable { 
     * @see JobInfo.Builder#setMinimumLatency(long)

     */

    public long getMinLatencyMillis() {

        return Math.max(0, minLatencyMillis);

        return minLatencyMillis;

    }



    /**

     * @see JobInfo.Builder#setOverrideDeadline(long)

     */

    public long getMaxExecutionDelayMillis() {

        return Math.max(0, maxExecutionDelayMillis);

        return maxExecutionDelayMillis;

    }



    /**
@@ -827,7 +818,7 @@ public class JobInfo implements Parcelable { 
     * @hide

     */

    public boolean hasEarlyConstraint() {

        return hasEarlyConstraint && minLatencyMillis > 0;

        return hasEarlyConstraint;

    }



    /**
@@ -836,7 +827,7 @@ public class JobInfo implements Parcelable { 
     * @hide

     */

    public boolean hasLateConstraint() {

        return hasLateConstraint && maxExecutionDelayMillis >= 0;

        return hasLateConstraint;

    }



    @Override
@@ -1878,13 +1869,6 @@ public class JobInfo implements Parcelable { 
         * Because it doesn't make sense setting this property on a periodic job, doing so will

         * throw an {@link java.lang.IllegalArgumentException} when

         * {@link android.app.job.JobInfo.Builder#build()} is called.

         *

         * Negative latencies also don't make sense for a job and are indicative of an error,

         * so starting in Android version {@link android.os.Build.VERSION_CODES#VANILLA_ICE_CREAM},

         * setting a negative deadline will result in

         * {@link android.app.job.JobInfo.Builder#build()} throwing an

         * {@link java.lang.IllegalArgumentException}.

         *

         * @param minLatencyMillis Milliseconds before which this job will not be considered for

         *                         execution.

         * @see JobInfo#getMinLatencyMillis()
@@ -1908,13 +1892,6 @@ public class JobInfo implements Parcelable { 
         * throw an {@link java.lang.IllegalArgumentException} when

         * {@link android.app.job.JobInfo.Builder#build()} is called.

         *

         * <p>

         * Negative deadlines also don't make sense for a job and are indicative of an error,

         * so starting in Android version {@link android.os.Build.VERSION_CODES#VANILLA_ICE_CREAM},

         * setting a negative deadline will result in

         * {@link android.app.job.JobInfo.Builder#build()} throwing an

         * {@link java.lang.IllegalArgumentException}.

         *

         * <p class="note">

         * Since a job will run once the deadline has passed regardless of the status of other

         * constraints, setting a deadline of 0 (or a {@link #setMinimumLatency(long) delay} equal
@@ -2212,15 +2189,13 @@ public class JobInfo implements Parcelable { 
        public JobInfo build() {

            return build(Compatibility.isChangeEnabled(DISALLOW_DEADLINES_FOR_PREFETCH_JOBS),

                    Compatibility.isChangeEnabled(REJECT_NEGATIVE_NETWORK_ESTIMATES),

                    Compatibility.isChangeEnabled(ENFORCE_MINIMUM_TIME_WINDOWS),

                    Compatibility.isChangeEnabled(REJECT_NEGATIVE_DELAYS_AND_DEADLINES));

                    Compatibility.isChangeEnabled(ENFORCE_MINIMUM_TIME_WINDOWS));

        }



        /** @hide */

        public JobInfo build(boolean disallowPrefetchDeadlines,

                boolean rejectNegativeNetworkEstimates,

                boolean enforceMinimumTimeWindows,

                boolean rejectNegativeDelaysAndDeadlines) {

                boolean enforceMinimumTimeWindows) {

            // This check doesn't need to be inside enforceValidity. It's an unnecessary legacy

            // check that would ideally be phased out instead.

            if (mBackoffPolicySet && (mConstraintFlags & CONSTRAINT_FLAG_DEVICE_IDLE) != 0) {
@@ -2230,7 +2205,7 @@ public class JobInfo implements Parcelable { 
            }

            JobInfo jobInfo = new JobInfo(this);

            jobInfo.enforceValidity(disallowPrefetchDeadlines, rejectNegativeNetworkEstimates,

                    enforceMinimumTimeWindows, rejectNegativeDelaysAndDeadlines);

                    enforceMinimumTimeWindows);

            return jobInfo;

        }
@@ -2250,8 +2225,7 @@ public class JobInfo implements Parcelable { 
     */

    public final void enforceValidity(boolean disallowPrefetchDeadlines,

            boolean rejectNegativeNetworkEstimates,

            boolean enforceMinimumTimeWindows,

            boolean rejectNegativeDelaysAndDeadlines) {

            boolean enforceMinimumTimeWindows) {

        // Check that network estimates require network type and are reasonable values.

        if ((networkDownloadBytes > 0 || networkUploadBytes > 0 || minimumNetworkChunkBytes > 0)

                && networkRequest == null) {
@@ -2285,17 +2259,6 @@ public class JobInfo implements Parcelable { 
            throw new IllegalArgumentException("Minimum chunk size must be positive");

        }



        if (rejectNegativeDelaysAndDeadlines) {

            if (minLatencyMillis < 0) {

                throw new IllegalArgumentException(

                        "Minimum latency is negative: " + minLatencyMillis);

            }

            if (maxExecutionDelayMillis < 0) {

                throw new IllegalArgumentException(

                        "Override deadline is negative: " + maxExecutionDelayMillis);

            }

        }



        final boolean hasDeadline = maxExecutionDelayMillis != 0L;

        // Check that a deadline was not set on a periodic job.

        if (isPeriodic) {

apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java

+2 −4
Original line number Diff line number Diff line
@@ -4850,7 +4850,7 @@ public class JobSchedulerService extends com.android.server.SystemService 
                    Slog.w(TAG, "Uid " + uid + " set bias on its job");

                    return new JobInfo.Builder(job)

                            .setBias(JobInfo.BIAS_DEFAULT)

                            .build(false, false, false, false);

                            .build(false, false, false);

                }

            }
@@ -4874,9 +4874,7 @@ public class JobSchedulerService extends com.android.server.SystemService 
                            JobInfo.DISALLOW_DEADLINES_FOR_PREFETCH_JOBS, callingUid),

                    rejectNegativeNetworkEstimates,

                    CompatChanges.isChangeEnabled(

                            JobInfo.ENFORCE_MINIMUM_TIME_WINDOWS, callingUid),

                    CompatChanges.isChangeEnabled(

                            JobInfo.REJECT_NEGATIVE_DELAYS_AND_DEADLINES, callingUid));

                            JobInfo.ENFORCE_MINIMUM_TIME_WINDOWS, callingUid));

            if ((job.getFlags() & JobInfo.FLAG_WILL_BE_FOREGROUND) != 0) {

                getContext().enforceCallingOrSelfPermission(

                        android.Manifest.permission.CONNECTIVITY_INTERNAL, TAG);

apex/jobscheduler/service/java/com/android/server/job/JobStore.java

+1 −1
Original line number Diff line number Diff line
@@ -1495,7 +1495,7 @@ public final class JobStore { 
                // return value), the deadline is dropped. Periodic jobs require all constraints

                // to be met, so there's no issue with their deadlines.

                // The same logic applies for other target SDK-based validation checks.

                builtJob = jobBuilder.build(false, false, false, false);

                builtJob = jobBuilder.build(false, false, false);

            } catch (Exception e) {

                Slog.w(TAG, "Unable to build job from XML, ignoring: " + jobBuilder.summarize(), e);

                return null;

apex/jobscheduler/service/java/com/android/server/job/controllers/JobStatus.java

+1 −1
Original line number Diff line number Diff line
@@ -657,7 +657,7 @@ public final class JobStatus { 
                    .build());

            // Don't perform validation checks at this point since we've already passed the

            // initial validation check.

            job = builder.build(false, false, false, false);

            job = builder.build(false, false, false);

        }



        this.job = job;