commit efc0db38e4035b4a205a8e7f842fabeb6921c5cd
author Hai Zhang <zhanghai@google.com> Mon Aug 03 18:55:23 2020 -0700
committer Hai Zhang <zhanghai@google.com> Mon Aug 03 19:00:07 2020 -0700
tree b1bae59cef742b324559c94ab03ae67594da94e1
parent 9999b20ea633b494aa94081b5949acb97b8c9da7

Fix AppOpsServiceTest flakiness.

AppOpsServiceTest creates multiple instances of AppOpsService, and
they write to the same file asynchronously, which may result in a
previous method overwriting the file being used by the current
method.

This change calls shutdown() after each test method, and removes any
pending write runnable from the handler. It also removes unnecessary
calls to readState() because state is always read in AppOpsService
constructor.

Fixes: 160785982
Test: atest AppOpsServiceTest
Change-Id: If792b61e5cae1d15601a18ef9cb0f71bc79d3d05

services/core/java/com/android/server/appop/AppOpsService.java

diff --git a/services/core/java/com/android/server/appop/AppOpsService.java b/services/core/java/com/android/server/appop/AppOpsService.java
index 74f3daf..dd29304 100644
--- a/services/core/java/com/android/server/appop/AppOpsService.java
+++ b/services/core/java/com/android/server/appop/AppOpsService.java
@@ -1892,6 +1892,7 @@
         synchronized (this) {
             if (mWriteScheduled) {
                 mWriteScheduled = false;
+                mHandler.removeCallbacks(mWriteRunner);
                 doWrite = true;
             }
         }

services/tests/mockingservicestests/src/com/android/server/appop/AppOpsServiceTest.java

diff --git a/services/tests/mockingservicestests/src/com/android/server/appop/AppOpsServiceTest.java b/services/tests/mockingservicestests/src/com/android/server/appop/AppOpsServiceTest.java
index 0a61c44..7a3a950 100644
--- a/services/tests/mockingservicestests/src/com/android/server/appop/AppOpsServiceTest.java
+++ b/services/tests/mockingservicestests/src/com/android/server/appop/AppOpsServiceTest.java
@@ -130,7 +130,9 @@
     }
 
     @After
-    public void resetStaticMocks() {
+    public void tearDown() {
+        mAppOpsService.shutdown();
+
         mMockingSession.finishMocking();
     }
 
@@ -216,9 +218,8 @@
                 false);
         mAppOpsService.writeState();
 
-        // Create a new app ops service, and initialize its state from XML.
+        // Create a new app ops service which will initialize its state from XML.
         setupAppOpsService();
-        mAppOpsService.readState();
 
         // Query the state of the 2nd service.
         List<PackageOps> loggedOps = getLoggedOps();
@@ -233,9 +234,8 @@
         mAppOpsService.noteOperation(OP_READ_SMS, mMyUid, sMyPackageName, null, false, null, false);
         mAppOpsService.shutdown();
 
-        // Create a new app ops service, and initialize its state from XML.
+        // Create a new app ops service which will initialize its state from XML.
         setupAppOpsService();
-        mAppOpsService.readState();
 
         // Query the state of the 2nd service.
         List<PackageOps> loggedOps = getLoggedOps();