Merge "Refactored to ensure thread safety"

1 files changed, 6 insertions, 5 deletions

diff --git a/apct-tests/perftests/contentcapture/src/android/view/contentcapture/MyContentCaptureService.java b/apct-tests/perftests/contentcapture/src/android/view/contentcapture/MyContentCaptureService.java
index b1dbb28c9501..d07ed375b2ab 100644
--- a/apct-tests/perftests/contentcapture/src/android/view/contentcapture/MyContentCaptureService.java
+++ b/apct-tests/perftests/contentcapture/src/android/view/contentcapture/MyContentCaptureService.java
@@ -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;
             }
         }
     }