From 3a2903b945b3c62394ae8df78bf68f3026c4ac0d Mon Sep 17 00:00:00 2001
From: Stanislav Zholnin <zholnin@google.com>
Date: Tue, 11 May 2021 12:03:44 +0100
Subject: [PATCH] Fix race condition in DiscreteRegistry test set up.

Fix: 187471134
Test: atest android.app.appops.cts.DiscreteAppopsTest
Change-Id: Ife71625711083edce6505cc3963ba51c7e8ff590
---
 .../core/java/com/android/server/appop/HistoricalRegistry.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/appop/HistoricalRegistry.java b/services/core/java/com/android/server/appop/HistoricalRegistry.java
index 55560150d53ad..35e8d34ce1853 100644
--- a/services/core/java/com/android/server/appop/HistoricalRegistry.java
+++ b/services/core/java/com/android/server/appop/HistoricalRegistry.java
@@ -555,8 +555,6 @@ final class HistoricalRegistry {
                     }
                     if (mMode == AppOpsManager.HISTORICAL_MODE_ENABLED_PASSIVE) {
                         mDiscreteRegistry.setDebugMode(true);
-                    } else {
-                        mDiscreteRegistry.setDebugMode(false);
                     }
                 }
                 if (mBaseSnapshotInterval != baseSnapshotInterval) {
@@ -627,6 +625,7 @@ final class HistoricalRegistry {
         }
         setHistoryParameters(DEFAULT_MODE, DEFAULT_SNAPSHOT_INTERVAL_MILLIS,
                 DEFAULT_COMPRESSION_STEP);
+        mDiscreteRegistry.setDebugMode(false);
     }
 
     void clearHistory(int uid, String packageName) {