commit 224fc4e4ebf6ca03b58527a1ef129255bd59a850
author Christopher Tate <ctate@google.com> Wed Jan 24 16:43:33 2018 -0800
committer android-build-team Robot <android-build-team-robot@google.com> Thu Jan 25 21:31:18 2018 +0000
tree 87c765bc6c2a662550fd4d4e44f37cca79a52d55
parent 0e8397328ebad8c70f5737c28ebb7269917c84bc

Deal gracefully with cancel of nonexistent jobs

In particular, fix an implicit assumption that jobs existing under
a given "caller" uid implies that the the same jobs must therefore
be known under their source uids as well.  This isn't true when the
jobs in question are sync jobs (caller uid = system) in secondary
users that have been torn down.

Bug: 72459151
Test: manual; automated multiuser sync testing tbd
Change-Id: I9bb6aabfabdaaee04c39236bc8e1bca696898a83
(cherry picked from commit 19a2f24e5f290441e3ef0264b4a6052a917dcce6)

services/core/java/com/android/server/job/JobStore.java

diff --git a/services/core/java/com/android/server/job/JobStore.java b/services/core/java/com/android/server/job/JobStore.java
index 6da783c..a24a4ac 100644
--- a/services/core/java/com/android/server/job/JobStore.java
+++ b/services/core/java/com/android/server/job/JobStore.java
@@ -1052,13 +1052,18 @@
             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;