Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix race condition in DiscreteRegistry test set up." into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-11 14:20:22 +00:00
committed by Android (Google) Code Review
parent d261ad7bfe 3a2903b945
commit 2a7c449484
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/appop/HistoricalRegistry.java
View File

@@ -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) {