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

Fix historical ops logging.

Browse Source 
Bug: 138866253
Test: presubmit
Change-Id: I2e1f460ec0d44064e7e21543f1c12b90678c6333
This commit is contained in:
Hai Zhang
2019-08-13 15:55:58 -07:00
parent 2814793744
commit f538767489
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -291,7 +291,7 @@ final class HistoricalRegistry {
makeRelativeToEpochStart(currentOps, nowMillis);
currentOps.accept(visitor);
if(isPersistenceInitializedMLocked()) {
if (!isPersistenceInitializedMLocked()) {
Slog.e(LOG_TAG, "Interaction before persistence initialized");
return;
}
@@ -457,7 +457,7 @@ final class HistoricalRegistry {
// it is a part of the persistence initialization process.
boolean resampleHistory = false;
Slog.i(LOG_TAG, "New history parameters: mode:"
+ AppOpsManager.historicalModeToString(mMode) + " baseSnapshotInterval:"
+ AppOpsManager.historicalModeToString(mode) + " baseSnapshotInterval:"
+ baseSnapshotInterval + " intervalCompressionMultiplier:"
+ intervalCompressionMultiplier);
if (mMode != mode) {
@@ -1066,7 +1066,7 @@ final class HistoricalRegistry {
normalizeSnapshotForSlotDuration(persistedOps, slotDurationMillis);
writeHistoricalOpsDLocked(persistedOps, intervalOverflowMillis, newFile);
if (DEBUG) {
Slog.i(LOG_TAG, "Persisted at depth: " + depth
Slog.i(LOG_TAG, "Persisted at depth: " + depth + " file: " + newFile
+ " ops:\n" + opsToDebugString(persistedOps));
enforceOpsWellFormed(persistedOps);
}
@@ -1160,7 +1160,7 @@ final class HistoricalRegistry {
}
if (DEBUG) {
if (allOps != null) {
Slog.i(LOG_TAG, "Read from file: " + file + "ops:\n"
Slog.i(LOG_TAG, "Read from file: " + file + " ops:\n"
+ opsToDebugString(allOps));
enforceOpsWellFormed(allOps);
}