Merge "Refactor to ensure thread safety" (28b61fcd) · Commits · e / os / android_frameworks_base

apct-tests/perftests/contentcapture/src/android/view/contentcapture/MyContentCaptureService.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -84,18 +84,18 @@ public class MyContentCaptureService extends ContentCaptureService {

		@Override
		public void onDisconnected() {
		Log.i(TAG, "onDisconnected: sServiceWatcher=" + sServiceWatcher);

		if (sServiceWatcher == null) {
		final ServiceWatcher sw = sServiceWatcher;
		Log.i(TAG, "onDisconnected: sServiceWatcher=" + sw);
		if (sw == null) {
		Log.e(TAG, "onDisconnected() without a watcher");
		return;
		}
		if (sServiceWatcher.mService == null) {
		Log.e(TAG, "onDisconnected(): no service on " + sServiceWatcher);
		if (sw.mService == null) {
		Log.e(TAG, "onDisconnected(): no service on " + sw);
		return;
		}

		sServiceWatcher.mDestroyed.countDown();
		sw.mDestroyed.countDown();
		clearServiceWatcher();
		}