Merge "Don't leak wakelock instances" into nyc-mr1-dev (121a9941) · Commits · e / os / android_frameworks_base

core/java/android/os/PowerManager.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -1339,6 +1339,11 @@ public final class PowerManager {
		mTag = tag;
		}

		/** @hide */
		public String getTag() {
		return mTag;
		}

		/** @hide */
		public void setHistoryTag(String tag) {
		mHistoryTag = tag;

+18 −4

Original line number	Diff line number	Diff line
		@@ -306,10 +306,24 @@ public class JobServiceContext extends IJobCallback.Stub implements ServiceConne
		this.service = IJobService.Stub.asInterface(service);
		final PowerManager pm =
		(PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
		mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, runningJob.getTag());
		mWakeLock.setWorkSource(new WorkSource(runningJob.getSourceUid()));
		mWakeLock.setReferenceCounted(false);
		mWakeLock.acquire();
		PowerManager.WakeLock wl = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK,
		runningJob.getTag());
		wl.setWorkSource(new WorkSource(runningJob.getSourceUid()));
		wl.setReferenceCounted(false);
		wl.acquire();
		synchronized (mLock) {
		// We use a new wakelock instance per job. In rare cases there is a race between
		// teardown following job completion/cancellation and new job service spin-up
		// such that if we simply assign mWakeLock to be the new instance, we orphan
		// the currently-live lock instead of cleanly replacing it. Watch for this and
		// explicitly fast-forward the release if we're in that situation.
		if (mWakeLock != null) {
		Slog.w(TAG, "Bound new job " + runningJob + " but live wakelock " + mWakeLock
		+ " tag=" + mWakeLock.getTag());
		mWakeLock.release();
		}
		mWakeLock = wl;
		}
		mCallbackHandler.obtainMessage(MSG_SERVICE_BOUND).sendToTarget();
		}