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

Commit b297de40 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix initialization in sql registry" into main

parents c8396e91 31629fec

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

+3 −4
Original line number Diff line number Diff line
@@ -128,18 +128,17 @@ abstract class DiscreteOpsRegistry { 
    static final long DEFAULT_DISCRETE_HISTORY_CUTOFF = Duration.ofDays(7).toMillis();

    static final long MAXIMUM_DISCRETE_HISTORY_CUTOFF = Duration.ofDays(30).toMillis();

    // The duration for which the data is kept, default is 7 days and max 30 days enforced.

    static long sDiscreteHistoryCutoff;

    static long sDiscreteHistoryCutoff = DEFAULT_DISCRETE_HISTORY_CUTOFF;



    static final long DEFAULT_DISCRETE_HISTORY_QUANTIZATION = Duration.ofMinutes(1).toMillis();

    // discrete ops are rounded up to quantization time, meaning we record one op per time bucket

    // in case of duplicate op events.

    static long sDiscreteHistoryQuantization;

    static long sDiscreteHistoryQuantization = DEFAULT_DISCRETE_HISTORY_QUANTIZATION;



    static int[] sDiscreteOps = new int[0];

    static int sDiscreteFlags;



    static final int OP_FLAGS_DISCRETE = OP_FLAG_SELF | OP_FLAG_TRUSTED_PROXIED

            | OP_FLAG_TRUSTED_PROXY;

    static int sDiscreteFlags = OP_FLAGS_DISCRETE;



    boolean mDebugMode = false;

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

+2 −0
Original line number Diff line number Diff line
@@ -262,11 +262,13 @@ final class LegacyHistoricalRegistry implements HistoricalRegistryInterface { 
            if (DiscreteOpsXmlRegistry.getDiscreteOpsDir().exists()) {

                DiscreteOpsSqlRegistry sqlRegistry = (DiscreteOpsSqlRegistry) mDiscreteRegistry;

                DiscreteOpsXmlRegistry xmlRegistry = new DiscreteOpsXmlRegistry(mContext);

                xmlRegistry.systemReady();

                DiscreteOpsMigrationHelper.migrateDiscreteOpsToSqlite(xmlRegistry, sqlRegistry);

            }

        } else {

            if (DiscreteOpsDbHelper.getDatabaseFile().exists()) { // roll-back sqlite

                DiscreteOpsSqlRegistry sqlRegistry = new DiscreteOpsSqlRegistry(mContext);

                sqlRegistry.systemReady();

                DiscreteOpsXmlRegistry xmlRegistry = (DiscreteOpsXmlRegistry) mDiscreteRegistry;

                DiscreteOpsMigrationHelper.migrateDiscreteOpsToXml(sqlRegistry, xmlRegistry);

            }