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

Commit 2a7c4494 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents d261ad7b 3a2903b9

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

+1 −2
Original line number Diff line number Diff line
@@ -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) {