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

Commit e4e6986e authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 13379675 from 8332da65 to 25Q3-release 

Change-Id: I209baddb48d4f710ae77abccae074cfee00e36d4
parents c37bb407 8332da65

apex/jobscheduler/service/aconfig/job.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -56,16 +56,6 @@ flag { 
   bug: "337077643"

}



flag {

   name: "use_correct_process_state_for_logging"

   namespace: "backstage_power"

   description: "Use correct process state for statsd logging"

   bug: "361308212"

   metadata {

       purpose: PURPOSE_BUGFIX

   }

}



flag {

   name: "enforce_quota_policy_to_fgs_jobs"

   namespace: "backstage_power"

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

+2 −4
Original line number Diff line number Diff line
@@ -483,8 +483,7 @@ public final class JobServiceContext implements ServiceConnection { 
            mInitialUploadedBytesFromCalling = TrafficStats.getUidTxBytes(job.getUid());



            int procState = mService.getUidProcState(job.getUid());

            if (Flags.useCorrectProcessStateForLogging()

                    && procState > ActivityManager.PROCESS_STATE_TRANSIENT_BACKGROUND) {

            if (procState > ActivityManager.PROCESS_STATE_TRANSIENT_BACKGROUND) {

                // Try to get the latest proc state from AMS, there might be some delay

                // for the proc states worse than TRANSIENT_BACKGROUND.

                procState = mActivityManagerInternal.getUidProcessState(job.getUid());
@@ -1626,8 +1625,7 @@ public final class JobServiceContext implements ServiceConnection { 
                loggingInternalStopReason, loggingDebugReason);

        final int sourceUid = completedJob.getSourceUid();

        int procState = mService.getUidProcState(completedJob.getUid());

        if (Flags.useCorrectProcessStateForLogging()

                && procState > ActivityManager.PROCESS_STATE_TRANSIENT_BACKGROUND) {

        if (procState > ActivityManager.PROCESS_STATE_TRANSIENT_BACKGROUND) {

            // Try to get the latest proc state from AMS, there might be some delay

            // for the proc states worse than TRANSIENT_BACKGROUND.

            procState = mActivityManagerInternal.getUidProcessState(completedJob.getUid());

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

+11 −6
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import android.provider.MediaStore; 
import android.text.format.DateFormat;

import android.util.ArrayMap;

import android.util.ArraySet;

import android.util.DebugUtils;

import android.util.IndentingPrintWriter;

import android.util.Pair;

import android.util.Patterns;
@@ -121,10 +122,10 @@ public final class JobStatus { 
    public static final int CONSTRAINT_DEADLINE = 1 << 30;

    public static final int CONSTRAINT_CONNECTIVITY = 1 << 28;

    public static final int CONSTRAINT_CONTENT_TRIGGER = 1 << 26;

    static final int CONSTRAINT_DEVICE_NOT_DOZING = 1 << 25; // Implicit constraint

    static final int CONSTRAINT_WITHIN_QUOTA = 1 << 24;      // Implicit constraint

    static final int CONSTRAINT_PREFETCH = 1 << 23;

    static final int CONSTRAINT_BACKGROUND_NOT_RESTRICTED = 1 << 22; // Implicit constraint

    public static final int CONSTRAINT_DEVICE_NOT_DOZING = 1 << 25; // Implicit constraint

    public static final int CONSTRAINT_WITHIN_QUOTA = 1 << 24;      // Implicit constraint

    public static final int CONSTRAINT_PREFETCH = 1 << 23;

    public static final int CONSTRAINT_BACKGROUND_NOT_RESTRICTED = 1 << 22; // Implicit constraint

    public static final int CONSTRAINT_FLEXIBLE = 1 << 21; // Implicit constraint



    private static final int IMPLICIT_CONSTRAINTS = 0
@@ -2004,8 +2005,8 @@ public final class JobStatus { 
        }

        if (DEBUG) {

            Slog.v(TAG,

                    "Constraint " + constraint + " is " + (!state ? "NOT " : "") + "satisfied for "

                            + toShortString());

                    "Constraint " + constraintsToString(constraint) + " is "

                            + (!state ? "NOT " : "") + "satisfied for " + toShortString());

        }

        final boolean wasReady = !state && isReady();

        satisfiedConstraints = (satisfiedConstraints&~constraint) | (state ? constraint : 0);
@@ -2845,6 +2846,10 @@ public final class JobStatus { 
        }

    }



    static String constraintsToString(int constraints) {

        return DebugUtils.flagsToString(JobStatus.class, "CONSTRAINT_", constraints);

    }



    // Dumpsys infrastructure

    @NeverCompile // Avoid size overhead of debugging code.

    public void dump(IndentingPrintWriter pw,  boolean full, long nowElapsed) {

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

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ public abstract class StateController { 
        final boolean jobWouldBeReady = jobStatus.wouldBeReadyWithConstraint(constraint);

        if (DEBUG) {

            Slog.v(TAG, "wouldBeReadyWithConstraintLocked: " + jobStatus.toShortString()

                    + " constraint=" + constraint

                    + " constraint=" + JobStatus.constraintsToString(constraint)

                    + " readyWithConstraint=" + jobWouldBeReady);

        }

        if (!jobWouldBeReady) {

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1443,6 +1443,7 @@ package android.app.admin { 
    field public static final int FLAG_SUPPORTED_MODES_DEVICE_OWNER = 4; // 0x4

    field public static final int FLAG_SUPPORTED_MODES_ORGANIZATION_OWNED = 1; // 0x1

    field public static final int FLAG_SUPPORTED_MODES_PERSONALLY_OWNED = 2; // 0x2

    field @FlaggedApi("android.app.supervision.flags.enable_lock_task_feature_quick_settings") public static final int LOCK_TASK_FEATURE_QUICK_SETTINGS = 128; // 0x80

    field public static final int PROVISIONING_TRIGGER_CLOUD_ENROLLMENT = 1; // 0x1

    field public static final int PROVISIONING_TRIGGER_MANAGED_ACCOUNT = 4; // 0x4

    field public static final int PROVISIONING_TRIGGER_NFC = 5; // 0x5