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

Commit 3a2903b9 authored by Stanislav Zholnin's avatar Stanislav Zholnin
Browse files

Fix race condition in DiscreteRegistry test set up. 

Fix: 187471134
Test: atest android.app.appops.cts.DiscreteAppopsTest
Change-Id: Ife71625711083edce6505cc3963ba51c7e8ff590
parent f0cf73d8

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) {