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

Commit b9643ac4 authored by Stanislav Zholnin's avatar Stanislav Zholnin Committed by Android (Google) Code Review
Browse files

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

parents 426e0e73 4c3fa27e

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

+7 −7
Original line number Original line Diff line number Diff line
@@ -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();