From a6861d86bae983c31535ce6a049e7b2ed030b55f Mon Sep 17 00:00:00 2001
From: TYM Tsai <tymtsai@google.com>
Date: Thu, 15 Jul 2021 22:10:19 +0800
Subject: [PATCH] Refactor to ensure thread safety

Make object pointer safety for multiple thread

Bug: 179834303
Test: atest ContentCapturePerfTests
Change-Id: I5c04dd3b1288fb3ac104738f159dba88b641a0bf
---
 .../view/contentcapture/MyContentCaptureService.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 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 d07ed375b2abd..ecc5112ab6dd8 100644
--- a/apct-tests/perftests/contentcapture/src/android/view/contentcapture/MyContentCaptureService.java
+++ b/apct-tests/perftests/contentcapture/src/android/view/contentcapture/MyContentCaptureService.java
@@ -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();
     }