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

Merge "Change logs level for "Interaction before persistence initialized" message." into sc-dev

Browse Source
This commit is contained in:
Stanislav Zholnin
2021-05-21 13:05:53 +00:00
committed by Android (Google) Code Review
parent 426e0e73b2 4c3fa27e49
commit b9643ac4ef
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -491,7 +491,7 @@ final class HistoricalRegistry {
synchronized (mInMemoryLock) { synchronized (mInMemoryLock) {
if (mMode == AppOpsManager.HISTORICAL_MODE_ENABLED_ACTIVE) { if (mMode == AppOpsManager.HISTORICAL_MODE_ENABLED_ACTIVE) {
if (!isPersistenceInitializedMLocked()) { if (!isPersistenceInitializedMLocked()) {
Slog.e(LOG_TAG, "Interaction before persistence initialized"); Slog.v(LOG_TAG, "Interaction before persistence initialized");
return; return;
} }
getUpdatedPendingHistoricalOpsMLocked( getUpdatedPendingHistoricalOpsMLocked(
@@ -509,7 +509,7 @@ final class HistoricalRegistry {
synchronized (mInMemoryLock) { synchronized (mInMemoryLock) {
if (mMode == AppOpsManager.HISTORICAL_MODE_ENABLED_ACTIVE) { if (mMode == AppOpsManager.HISTORICAL_MODE_ENABLED_ACTIVE) {
if (!isPersistenceInitializedMLocked()) { if (!isPersistenceInitializedMLocked()) {
Slog.e(LOG_TAG, "Interaction before persistence initialized"); Slog.v(LOG_TAG, "Interaction before persistence initialized");
return; return;
} }
getUpdatedPendingHistoricalOpsMLocked( getUpdatedPendingHistoricalOpsMLocked(
@@ -525,7 +525,7 @@ final class HistoricalRegistry {
synchronized (mInMemoryLock) { synchronized (mInMemoryLock) {
if (mMode == AppOpsManager.HISTORICAL_MODE_ENABLED_ACTIVE) { if (mMode == AppOpsManager.HISTORICAL_MODE_ENABLED_ACTIVE) {
if (!isPersistenceInitializedMLocked()) { if (!isPersistenceInitializedMLocked()) {
Slog.e(LOG_TAG, "Interaction before persistence initialized"); Slog.v(LOG_TAG, "Interaction before persistence initialized");
return; return;
} }
getUpdatedPendingHistoricalOpsMLocked( getUpdatedPendingHistoricalOpsMLocked(
@@ -604,7 +604,7 @@ final class HistoricalRegistry {
final List<HistoricalOps> pendingWrites; final List<HistoricalOps> pendingWrites;
synchronized (mInMemoryLock) { synchronized (mInMemoryLock) {
if (!isPersistenceInitializedMLocked()) { if (!isPersistenceInitializedMLocked()) {
Slog.e(LOG_TAG, "Interaction before persistence initialized"); Slog.d(LOG_TAG, "Interaction before persistence initialized");
return; return;
} }
// The history files start from mBaseSnapshotInterval - take this into account. // The history files start from mBaseSnapshotInterval - take this into account.
@@ -623,7 +623,7 @@ final class HistoricalRegistry {
void resetHistoryParameters() { void resetHistoryParameters() {
if (!isPersistenceInitializedMLocked()) { if (!isPersistenceInitializedMLocked()) {
Slog.e(LOG_TAG, "Interaction before persistence initialized"); Slog.d(LOG_TAG, "Interaction before persistence initialized");
return; return;
} }
setHistoryParameters(DEFAULT_MODE, DEFAULT_SNAPSHOT_INTERVAL_MILLIS, setHistoryParameters(DEFAULT_MODE, DEFAULT_SNAPSHOT_INTERVAL_MILLIS,
@@ -635,7 +635,7 @@ final class HistoricalRegistry {
synchronized (mOnDiskLock) { synchronized (mOnDiskLock) {
synchronized (mInMemoryLock) { synchronized (mInMemoryLock) {
if (!isPersistenceInitializedMLocked()) { if (!isPersistenceInitializedMLocked()) {
Slog.e(LOG_TAG, "Interaction before persistence initialized"); Slog.d(LOG_TAG, "Interaction before persistence initialized");
return; return;
} }
if (mMode != AppOpsManager.HISTORICAL_MODE_ENABLED_ACTIVE) { if (mMode != AppOpsManager.HISTORICAL_MODE_ENABLED_ACTIVE) {
@@ -668,7 +668,7 @@ final class HistoricalRegistry {
synchronized (mOnDiskLock) { synchronized (mOnDiskLock) {
synchronized (mInMemoryLock) { synchronized (mInMemoryLock) {
if (!isPersistenceInitializedMLocked()) { if (!isPersistenceInitializedMLocked()) {
Slog.e(LOG_TAG, "Interaction before persistence initialized"); Slog.d(LOG_TAG, "Interaction before persistence initialized");
return; return;
} }
clearHistoryOnDiskDLocked(); clearHistoryOnDiskDLocked();