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

Merge "Deal gracefully with cancel of nonexistent jobs"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-01-25 21:39:44 +00:00
committed by Android (Google) Code Review
parent 675600bd80 19a2f24e5f
commit bb2af291c5
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/job/JobStore.java
View File

@@ -1052,13 +1052,18 @@ public final class JobStore {
final ArraySet<JobStatus> jobs = mJobs.get(uid);
final int sourceUid = job.getSourceUid();
final ArraySet<JobStatus> jobsForSourceUid = mJobsPerSourceUid.get(sourceUid);
boolean didRemove = jobs != null && jobs.remove(job) && jobsForSourceUid.remove(job);
if (didRemove) {
if (jobs.size() == 0) {
// no more jobs for this uid; let the now-empty set object be GC'd.
final boolean didRemove = jobs != null && jobs.remove(job);
final boolean sourceRemove = jobsForSourceUid != null && jobsForSourceUid.remove(job);
if (didRemove != sourceRemove) {
Slog.wtf(TAG, "Job presence mismatch; caller=" + didRemove
+ " source=" + sourceRemove);
}
if (didRemove || sourceRemove) {
// no more jobs for this uid? let the now-empty set objects be GC'd.
if (jobs != null && jobs.size() == 0) {
mJobs.remove(uid);
}
if (jobsForSourceUid.size() == 0) {
if (jobsForSourceUid != null && jobsForSourceUid.size() == 0) {
mJobsPerSourceUid.remove(sourceUid);
}
return true;