Merge "Refactored to ensure thread safety" (dbab9ed6) · Commits · e / os / android_frameworks_base

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

+6 −5

Original line number	Diff line number	Diff line
		@@ -51,13 +51,14 @@ public class MyContentCaptureService extends ContentCaptureService {
		sServiceWatcher = null;
		}

		public static void clearServiceWatcher() {
		if (sServiceWatcher != null) {
		if (sServiceWatcher.mReadyToClear) {
		sServiceWatcher.mService = null;
		private static void clearServiceWatcher() {
		final ServiceWatcher sw = sServiceWatcher;
		if (sw != null) {
		if (sw.mReadyToClear) {
		sw.mService = null;
		sServiceWatcher = null;
		} else {
		sServiceWatcher.mReadyToClear = true;
		sw.mReadyToClear = true;
		}
		}
		}