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

Merge "Only clear preferred UID at appropriate times." into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-03-25 22:12:51 +00:00
committed by Android (Google) Code Review
parent 381743d2ee 807dab2cb3
commit 82100c9d36
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apex/jobscheduler/service/java/com/android/server/job/JobConcurrencyManager.java
View File

@@ -686,9 +686,6 @@ class JobConcurrencyManager {
stoppable.removeAt(s); stoppable.removeAt(s);
assignment.newJob = nextPending; assignment.newJob = nextPending;
assignment.newWorkType = replaceWorkType; assignment.newWorkType = replaceWorkType;
// Don't preserve the UID since we're stopping the job because
// something is pending (eg. EJs).
assignment.context.clearPreferredUid();
break; break;
} }
} }
@@ -769,20 +766,20 @@ class JobConcurrencyManager {
} }
for (int s = stoppable.size() - 1; s >= 0; --s) { for (int s = stoppable.size() - 1; s >= 0; --s) {
final ContextAssignment assignment = stoppable.valueAt(s); final ContextAssignment assignment = stoppable.valueAt(s);
// The preferred UID is set when we cancel with PREEMPT reason, but don't preserve the
// UID for any stoppable contexts since we want to open the context up to any/all apps.
assignment.context.clearPreferredUid(); assignment.context.clearPreferredUid();
assignment.clear(); assignment.clear();
mContextAssignmentPool.release(assignment); mContextAssignmentPool.release(assignment);
} }
for (int p = preferredUidOnly.size() - 1; p >= 0; --p) { for (int p = preferredUidOnly.size() - 1; p >= 0; --p) {
final ContextAssignment assignment = preferredUidOnly.valueAt(p); final ContextAssignment assignment = preferredUidOnly.valueAt(p);
assignment.context.clearPreferredUid();
assignment.clear(); assignment.clear();
mContextAssignmentPool.release(assignment); mContextAssignmentPool.release(assignment);
} }
for (int i = idle.size() - 1; i >= 0; --i) { for (int i = idle.size() - 1; i >= 0; --i) {
final ContextAssignment assignment = idle.valueAt(i); final ContextAssignment assignment = idle.valueAt(i);
mIdleContexts.add(assignment.context); mIdleContexts.add(assignment.context);
assignment.context.clearPreferredUid();
assignment.clear(); assignment.clear();
mContextAssignmentPool.release(assignment); mContextAssignmentPool.release(assignment);
} }