Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Log when job quota is reduced for buggy apps" into udc-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2023-07-18 01:01:12 +00:00
committed by Android (Google) Code Review
parent ecf1a0663b 65a7257850
commit ac443c4474
1 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,6 +56,7 @@ import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.ArrayUtils; import com.android.internal.util.ArrayUtils;
import com.android.internal.util.FrameworkStatsLog; import com.android.internal.util.FrameworkStatsLog;
import com.android.modules.expresslog.Counter;
import com.android.server.LocalServices; import com.android.server.LocalServices;
import com.android.server.job.GrantedUriPermissions; import com.android.server.job.GrantedUriPermissions;
import com.android.server.job.JobSchedulerInternal; import com.android.server.job.JobSchedulerInternal;
@@ -161,6 +162,9 @@ public final class JobStatus {
/** If the job is going to be passed an unmetered network. */ /** If the job is going to be passed an unmetered network. */
private boolean mHasAccessToUnmetered; private boolean mHasAccessToUnmetered;
/** If the effective bucket has been downgraded once due to being buggy. */
private boolean mIsDowngradedDueToBuggyApp;
/** /**
* The additional set of dynamic constraints that must be met if this is an expedited job that * The additional set of dynamic constraints that must be met if this is an expedited job that
* had a long enough run while the device was Dozing or in battery saver. * had a long enough run while the device was Dozing or in battery saver.
@@ -1173,18 +1177,32 @@ public final class JobStatus {
// like other ACTIVE apps. // like other ACTIVE apps.
return ACTIVE_INDEX; return ACTIVE_INDEX;
} }
final int bucketWithMediaExemption;
if (actualBucket != RESTRICTED_INDEX && actualBucket != NEVER_INDEX
&& mHasMediaBackupExemption) {
// Treat it as if it's at most WORKING_INDEX (lower index grants higher quota) since
// media backup jobs are important to the user, and the source package may not have
// been used directly in a while.
bucketWithMediaExemption = Math.min(WORKING_INDEX, actualBucket);
} else {
bucketWithMediaExemption = actualBucket;
}
// If the app is considered buggy, but hasn't yet been put in the RESTRICTED bucket // If the app is considered buggy, but hasn't yet been put in the RESTRICTED bucket
// (potentially because it's used frequently by the user), limit its effective bucket // (potentially because it's used frequently by the user), limit its effective bucket
// so that it doesn't get to run as much as a normal ACTIVE app. // so that it doesn't get to run as much as a normal ACTIVE app.
final int highestBucket = isBuggy ? WORKING_INDEX : ACTIVE_INDEX; if (isBuggy && bucketWithMediaExemption < WORKING_INDEX) {
if (actualBucket != RESTRICTED_INDEX && actualBucket != NEVER_INDEX if (!mIsDowngradedDueToBuggyApp) {
&& mHasMediaBackupExemption) { // Safety check to avoid logging multiple times for the same job.
// Treat it as if it's at least WORKING_INDEX since media backup jobs are important Counter.logIncrementWithUid(
// to the user, and the "job_scheduler.value_job_quota_reduced_due_to_buggy_uid",
// source package may not have been used directly in a while. getTimeoutBlameUid());
return Math.max(highestBucket, Math.min(WORKING_INDEX, actualBucket)); mIsDowngradedDueToBuggyApp = true;
} }
return Math.max(highestBucket, actualBucket); return WORKING_INDEX;
}
return bucketWithMediaExemption;
} }
/** Returns the real standby bucket of the job. */ /** Returns the real standby bucket of the job. */