diff options
| author | 2021-05-11 14:20:22 +0000 | |
|---|---|---|
| committer | 2021-05-11 14:20:22 +0000 | |
| commit | 2a7c449484b42e8b7368b2a7f80416378bcfbed7 (patch) | |
| tree | ea8213da83ab85332198607b9d9a814227b8adbd | |
| parent | d261ad7bfe4ed784755cc27bb1cb7bceac2dc3c5 (diff) | |
| parent | 3a2903b945b3c62394ae8df78bf68f3026c4ac0d (diff) | |
Merge "Fix race condition in DiscreteRegistry test set up." into sc-dev
| -rw-r--r-- | services/core/java/com/android/server/appop/HistoricalRegistry.java | 3 |
1 files changed, 1 insertions, 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 55560150d53a..35e8d34ce185 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) { |