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

Merge "Fix issue #28075893: Don't hold strong refs on to JobService" into nyc-dev

Browse Source
This commit is contained in:
Dianne Hackborn
2016-04-08 19:28:41 +00:00
committed by Android (Google) Code Review
parent fe5e1a75c1 0796e9fb3d
commit 6827db3e5f
1 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
core/java/android/app/job/JobService.java
View File

@@ -27,6 +27,8 @@ import android.util.Log;
import com.android.internal.annotations.GuardedBy;
import java.lang.ref.WeakReference;
/**
* <p>Entry point for the callback from the {@link android.app.job.JobScheduler}.</p>
* <p>This is the base class that handles asynchronous requests that were previously scheduled. You
@@ -62,15 +64,15 @@ public abstract class JobService extends Service {
* Identifier for a message that will result in a call to
* {@link #onStartJob(android.app.job.JobParameters)}.
*/
private final int MSG_EXECUTE_JOB = 0;
private static final int MSG_EXECUTE_JOB = 0;
/**
* Message that will result in a call to {@link #onStopJob(android.app.job.JobParameters)}.
*/
private final int MSG_STOP_JOB = 1;
private static final int MSG_STOP_JOB = 1;
/**
* Message that the client has completed execution of this job.
*/
private final int MSG_JOB_FINISHED = 2;
private static final int MSG_JOB_FINISHED = 2;
/** Lock object for {@link #mHandler}. */
private final Object mHandlerLock = new Object();
@@ -82,21 +84,36 @@ public abstract class JobService extends Service {
@GuardedBy("mHandlerLock")
JobHandler mHandler;
/** Binder for this service. */
IJobService mBinder = new IJobService.Stub() {
@Override
public void startJob(JobParameters jobParams) {
ensureHandler();
Message m = Message.obtain(mHandler, MSG_EXECUTE_JOB, jobParams);
m.sendToTarget();
static final class JobInterface extends IJobService.Stub {
final WeakReference<JobService> mService;
JobInterface(JobService service) {
mService = new WeakReference<>(service);
}
@Override
public void stopJob(JobParameters jobParams) {
ensureHandler();
Message m = Message.obtain(mHandler, MSG_STOP_JOB, jobParams);
m.sendToTarget();
public void startJob(JobParameters jobParams) throws RemoteException {
JobService service = mService.get();
if (service != null) {
service.ensureHandler();
Message m = Message.obtain(service.mHandler, MSG_EXECUTE_JOB, jobParams);
m.sendToTarget();
}
}
};
@Override
public void stopJob(JobParameters jobParams) throws RemoteException {
JobService service = mService.get();
if (service != null) {
service.ensureHandler();
Message m = Message.obtain(service.mHandler, MSG_STOP_JOB, jobParams);
m.sendToTarget();
}
}
}
IJobService mBinder;
/** @hide */
void ensureHandler() {
@@ -194,6 +211,9 @@ public abstract class JobService extends Service {
/** @hide */
public final IBinder onBind(Intent intent) {
if (mBinder == null) {
mBinder = new JobInterface(this);
}
return mBinder.asBinder();
}