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

Fix bad locking.

Browse Source 
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
This commit is contained in:
Ian Rogers
2016-05-27 14:06:58 -07:00
parent 6f2f02e4ae
commit a5feec52a6
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/DocumentsUI/src/com/android/documentsui/services/FileOperationService.java
View File

@@ -95,7 +95,7 @@ public class FileOperationService extends Service implements Job.Listener {
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 @@ public class FileOperationService extends Service implements Job.Listener {
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));
}
}
/**