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

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

Snap for 10245577 from 2904a182 to udc-qpr1-release

Change-Id: I54a1f170c92961bf31e379c857df19d385dcfc53
parents 7b4bb460 2904a182
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -1598,7 +1598,7 @@ public class JobSchedulerService extends com.android.server.SystemService
                    uId, null, jobStatus.getBatteryName(),
                    FrameworkStatsLog.SCHEDULED_JOB_STATE_CHANGED__STATE__SCHEDULED,
                    JobProtoEnums.INTERNAL_STOP_REASON_UNKNOWN, jobStatus.getStandbyBucket(),
                    jobStatus.getJobId(),
                    jobStatus.getLoggingJobId(),
                    jobStatus.hasChargingConstraint(),
                    jobStatus.hasBatteryNotLowConstraint(),
                    jobStatus.hasStorageNotLowConstraint(),
@@ -2026,7 +2026,7 @@ public class JobSchedulerService extends com.android.server.SystemService
                    cancelled.getSourceUid(), null, cancelled.getBatteryName(),
                    FrameworkStatsLog.SCHEDULED_JOB_STATE_CHANGED__STATE__CANCELLED,
                    internalReasonCode, cancelled.getStandbyBucket(),
                    cancelled.getJobId(),
                    cancelled.getLoggingJobId(),
                    cancelled.hasChargingConstraint(),
                    cancelled.hasBatteryNotLowConstraint(),
                    cancelled.hasStorageNotLowConstraint(),
+4 −2
Original line number Diff line number Diff line
@@ -465,7 +465,8 @@ public final class JobServiceContext implements ServiceConnection {
                    job.getSourceUid(), null, job.getBatteryName(),
                    FrameworkStatsLog.SCHEDULED_JOB_STATE_CHANGED__STATE__STARTED,
                    JobProtoEnums.INTERNAL_STOP_REASON_UNKNOWN,
                    job.getStandbyBucket(), job.getJobId(),
                    job.getStandbyBucket(),
                    job.getLoggingJobId(),
                    job.hasChargingConstraint(),
                    job.hasBatteryNotLowConstraint(),
                    job.hasStorageNotLowConstraint(),
@@ -1521,7 +1522,8 @@ public final class JobServiceContext implements ServiceConnection {
        FrameworkStatsLog.write_non_chained(FrameworkStatsLog.SCHEDULED_JOB_STATE_CHANGED,
                completedJob.getSourceUid(), null, completedJob.getBatteryName(),
                FrameworkStatsLog.SCHEDULED_JOB_STATE_CHANGED__STATE__FINISHED,
                loggingInternalStopReason, completedJob.getStandbyBucket(), completedJob.getJobId(),
                loggingInternalStopReason, completedJob.getStandbyBucket(),
                completedJob.getLoggingJobId(),
                completedJob.hasChargingConstraint(),
                completedJob.hasBatteryNotLowConstraint(),
                completedJob.hasStorageNotLowConstraint(),
+15 −0
Original line number Diff line number Diff line
@@ -231,6 +231,8 @@ public final class JobStatus {
    final String sourceTag;
    @Nullable
    private final String mNamespace;
    /** An ID that can be used to uniquely identify the job when logging statsd metrics. */
    private final long mLoggingJobId;

    final String tag;

@@ -568,6 +570,7 @@ public final class JobStatus {
        this.callingUid = callingUid;
        this.standbyBucket = standbyBucket;
        mNamespace = namespace;
        mLoggingJobId = generateLoggingId(namespace, job.getId());

        int tempSourceUid = -1;
        if (sourceUserId != -1 && sourcePackageName != null) {
@@ -804,6 +807,13 @@ public final class JobStatus {
                /*innerFlags=*/ 0, /* dynamicConstraints */ 0);
    }

    private long generateLoggingId(@Nullable String namespace, int jobId) {
        if (namespace == null) {
            return jobId;
        }
        return ((long) namespace.hashCode()) << 31 | jobId;
    }

    public void enqueueWorkLocked(JobWorkItem work) {
        if (pendingWork == null) {
            pendingWork = new ArrayList<>();
@@ -956,6 +966,11 @@ public final class JobStatus {
        return job.getId();
    }

    /** Returns an ID that can be used to uniquely identify the job when logging statsd metrics. */
    public long getLoggingJobId() {
        return mLoggingJobId;
    }

    public void printUniqueId(PrintWriter pw) {
        if (mNamespace != null) {
            pw.print(mNamespace);
+2 −0
Original line number Diff line number Diff line
@@ -3568,6 +3568,8 @@ package android.view {
    field public static final int ACCESSIBILITY_TITLE_CHANGED = 33554432; // 0x2000000
    field public static final int FLAG_SLIPPERY = 536870912; // 0x20000000
    field public CharSequence accessibilityTitle;
    field public float preferredMaxDisplayRefreshRate;
    field public float preferredMinDisplayRefreshRate;
    field public int privateFlags;
  }

+10 −0
Original line number Diff line number Diff line
@@ -1083,6 +1083,16 @@ public class Activity extends ContextThemeWrapper
            setTaskDescription(mTaskDescription);
        }

        /**
         * Update the forced status bar appearance.
         * @hide
         */
        @Override
        public void updateStatusBarAppearance(int appearance) {
            mTaskDescription.setStatusBarAppearance(appearance);
            setTaskDescription(mTaskDescription);
        }

        /**
         * Update the forced navigation bar color.
         * @hide
Loading