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

Commit 338ce0b7 authored by Kweku Adams's avatar Kweku Adams
Browse files

Mark RESTRICTED bucket stop reasons. 

Try to mark when a job is being stopped because it's in the RESTRICTED
bucket. Even though the job's requested constraints may become
unsatisfied around the same time as dynamic constraints, this just
assumes that any unsatisfied dynamic constraints are the reason the job
is being stopped.

Bug: 149873527
Test: Android builds
Change-Id: I7ad8b9930805e02e0dc8ff7b050b4f0590ebe831
parent 27f83cdb

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

+4 −3
Original line number Diff line number Diff line
@@ -54,7 +54,8 @@ public class JobParameters implements Parcelable { 
     *

     * @hide

     */

    public static final int REASON_RESTRAINED = JobProtoEnums.STOP_REASON_RESTRAINED; // 6.

    public static final int REASON_RESTRICTED_BUCKET =

            JobProtoEnums.STOP_REASON_RESTRICTED_BUCKET; // 6.



    /**

     * All the stop reason codes. This should be regarded as an immutable array at runtime.
@@ -72,7 +73,7 @@ public class JobParameters implements Parcelable { 
            REASON_TIMEOUT,

            REASON_DEVICE_IDLE,

            REASON_DEVICE_THERMAL,

            REASON_RESTRAINED,

            REASON_RESTRICTED_BUCKET,

    };



    /**
@@ -88,7 +89,7 @@ public class JobParameters implements Parcelable { 
            case REASON_TIMEOUT: return "timeout";

            case REASON_DEVICE_IDLE: return "device_idle";

            case REASON_DEVICE_THERMAL: return "thermal";

            case REASON_RESTRAINED: return "restrained";

            case REASON_RESTRICTED_BUCKET: return "restricted_bucket";

            default: return "unknown:" + reasonCode;

        }

    }

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

+13 −3
Original line number Diff line number Diff line
@@ -1955,9 +1955,19 @@ public class JobSchedulerService extends com.android.server.SystemService 
                continue;

            }

            if (!running.isReady()) {

                // If a restricted job doesn't have dynamic constraints satisfied, assume that's

                // the reason the job is being stopped, instead of because of other constraints

                // not being satisfied.

                if (running.getEffectiveStandbyBucket() == RESTRICTED_INDEX

                        && !running.areDynamicConstraintsSatisfied()) {

                    serviceContext.cancelExecutingJobLocked(

                            JobParameters.REASON_RESTRICTED_BUCKET,

                            "cancelled due to restricted bucket");

                } else {

                    serviceContext.cancelExecutingJobLocked(

                            JobParameters.REASON_CONSTRAINTS_NOT_SATISFIED,

                            "cancelled due to unsatisfied constraints");

                }

            } else {

                final JobRestriction restriction = checkIfRestricted(running);

                if (restriction != null) {

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

+5 −0
Original line number Diff line number Diff line
@@ -1293,6 +1293,11 @@ public final class JobStatus { 
            CONSTRAINT_CHARGING | CONSTRAINT_BATTERY_NOT_LOW | CONSTRAINT_STORAGE_NOT_LOW

                    | CONSTRAINT_TIMING_DELAY | CONSTRAINT_IDLE;



    /** Returns true whenever all dynamically set constraints are satisfied. */

    public boolean areDynamicConstraintsSatisfied() {

        return mReadyDynamicSatisfied;

    }



    /**

     * @return Whether the constraints set on this job are satisfied.

     */

core/proto/android/app/job/enums.proto

+1 −1
Original line number Diff line number Diff line
@@ -34,5 +34,5 @@ enum StopReasonEnum { 
    STOP_REASON_TIMEOUT = 3;

    STOP_REASON_DEVICE_IDLE = 4;

    STOP_REASON_DEVICE_THERMAL = 5;

    STOP_REASON_RESTRAINED = 6;

    STOP_REASON_RESTRICTED_BUCKET = 6;

}