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

Merge "Build JobStatus objects outside the lock" into nyc-dev

Browse Source 
am: 87ad1fce25

* commit '87ad1fce254bdb398c5a33753f0368a596fd81f0':
  Build JobStatus objects outside the lock

Change-Id: I91f11f9de40e5d8cfa8c5619796dedd56c490eb5
This commit is contained in:
Christopher Tate
2016-05-31 18:42:03 +00:00
committed by android-build-merger
parent 49459e4ee8 87ad1fce25
commit 4d628b86e4
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/job/JobServiceContext.java
View File

@@ -223,10 +223,11 @@ public class JobServiceContext extends IJobCallback.Stub implements ServiceConne
* stop executing. * stop executing.
*/ */
JobStatus getRunningJob() { JobStatus getRunningJob() {
final JobStatus job;
synchronized (mLock) { synchronized (mLock) {
return mRunningJob == null ? job = mRunningJob;
null : new JobStatus(mRunningJob);
} }
return job == null ? null : new JobStatus(job);
} }
/** Called externally when a job that was scheduled for execution should be cancelled. */ /** Called externally when a job that was scheduled for execution should be cancelled. */