Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0105d52c authored by Stanislav Zholnin's avatar Stanislav Zholnin Committed by Automerger Merge Worker
Browse files

Merge "Change logs level for "Interaction before persistence initialized"... 

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14663318

Change-Id: Ibb2009de60eb278b441549992813f3399533ab35
parents ec16de4f b9643ac4

services/core/java/com/android/server/appop/HistoricalRegistry.java

+7 −7
Original line number Diff line number Diff line
@@ -491,7 +491,7 @@ final class HistoricalRegistry { 
        synchronized (mInMemoryLock) {

            if (mMode == AppOpsManager.HISTORICAL_MODE_ENABLED_ACTIVE) {

                if (!isPersistenceInitializedMLocked()) {

                    Slog.e(LOG_TAG, "Interaction before persistence initialized");

                    Slog.v(LOG_TAG, "Interaction before persistence initialized");

                    return;

                }

                getUpdatedPendingHistoricalOpsMLocked(
@@ -509,7 +509,7 @@ final class HistoricalRegistry { 
        synchronized (mInMemoryLock) {

            if (mMode == AppOpsManager.HISTORICAL_MODE_ENABLED_ACTIVE) {

                if (!isPersistenceInitializedMLocked()) {

                    Slog.e(LOG_TAG, "Interaction before persistence initialized");

                    Slog.v(LOG_TAG, "Interaction before persistence initialized");

                    return;

                }

                getUpdatedPendingHistoricalOpsMLocked(
@@ -525,7 +525,7 @@ final class HistoricalRegistry { 
        synchronized (mInMemoryLock) {

            if (mMode == AppOpsManager.HISTORICAL_MODE_ENABLED_ACTIVE) {

                if (!isPersistenceInitializedMLocked()) {

                    Slog.e(LOG_TAG, "Interaction before persistence initialized");

                    Slog.v(LOG_TAG, "Interaction before persistence initialized");

                    return;

                }

                getUpdatedPendingHistoricalOpsMLocked(
@@ -604,7 +604,7 @@ final class HistoricalRegistry { 
        final List<HistoricalOps> pendingWrites;

        synchronized (mInMemoryLock) {

            if (!isPersistenceInitializedMLocked()) {

                Slog.e(LOG_TAG, "Interaction before persistence initialized");

                Slog.d(LOG_TAG, "Interaction before persistence initialized");

                return;

            }

            // The history files start from mBaseSnapshotInterval - take this into account.
@@ -623,7 +623,7 @@ final class HistoricalRegistry { 


    void resetHistoryParameters() {

        if (!isPersistenceInitializedMLocked()) {

            Slog.e(LOG_TAG, "Interaction before persistence initialized");

            Slog.d(LOG_TAG, "Interaction before persistence initialized");

            return;

        }

        setHistoryParameters(DEFAULT_MODE, DEFAULT_SNAPSHOT_INTERVAL_MILLIS,
@@ -635,7 +635,7 @@ final class HistoricalRegistry { 
        synchronized (mOnDiskLock) {

            synchronized (mInMemoryLock) {

                if (!isPersistenceInitializedMLocked()) {

                    Slog.e(LOG_TAG, "Interaction before persistence initialized");

                    Slog.d(LOG_TAG, "Interaction before persistence initialized");

                    return;

                }

                if (mMode != AppOpsManager.HISTORICAL_MODE_ENABLED_ACTIVE) {
@@ -668,7 +668,7 @@ final class HistoricalRegistry { 
        synchronized (mOnDiskLock) {

            synchronized (mInMemoryLock) {

                if (!isPersistenceInitializedMLocked()) {

                    Slog.e(LOG_TAG, "Interaction before persistence initialized");

                    Slog.d(LOG_TAG, "Interaction before persistence initialized");

                    return;

                }

                clearHistoryOnDiskDLocked();