commit a5feec52a66d2258fe23cd262bc54e0f58113a8b
author Ian Rogers <irogers@google.com> Fri May 27 14:06:58 2016 -0700
committer Ian Rogers <irogers@google.com> Fri May 27 14:30:06 2016 -0700
tree b083b1ffbf3ea12aa16ecbadcc0fd77f4c40f2d7
parent 6f2f02e4ae5d61111bf52dbddd105cbc0a0f5e74

Fix bad locking.

When synchronizing on a field, it should be final to avoid locking on different
objects.
Missing synchronization on use of mRunning caught by Error Prone's @GuardedBy
checker.
Bug: 27723540

Change-Id: I9d7c9e37f8ef5f7f49707bfdf607a6b73b9654d8

packages/DocumentsUI/src/com/android/documentsui/services/FileOperationService.java

diff --git a/packages/DocumentsUI/src/com/android/documentsui/services/FileOperationService.java b/packages/DocumentsUI/src/com/android/documentsui/services/FileOperationService.java
index 871e135..5b2394e 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/services/FileOperationService.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/services/FileOperationService.java
@@ -95,7 +95,7 @@
     private NotificationManager mNotificationManager;
 
     @GuardedBy("mRunning")
-    private Map<String, JobRecord> mRunning = new HashMap<>();
+    private final Map<String, JobRecord> mRunning = new HashMap<>();
 
     private int mLastServiceId;
 
@@ -176,7 +176,9 @@
         if (DEBUG) Log.d(
                 TAG, "Scheduling job " + job.id + " to run in " + delay + " milliseconds.");
         ScheduledFuture<?> future = executor.schedule(job, delay, TimeUnit.MILLISECONDS);
-        mRunning.put(jobId, new JobRecord(job, future));
+        synchronized (mRunning) {
+            mRunning.put(jobId, new JobRecord(job, future));
+        }
     }
 
     /**