Merge "Migrate discrete ops in system ready callback" into main (d1a5362a) · Commits · e / os / android_frameworks_base

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

+13 −10

Original line number	Diff line number	Diff line
		@@ -205,18 +205,8 @@ final class HistoricalRegistry {
		mContext = context;
		if (Flags.enableSqliteAppopsAccesses()) {
		mDiscreteRegistry = new DiscreteOpsSqlRegistry(context);
		if (DiscreteOpsXmlRegistry.getDiscreteOpsDir().exists()) {
		DiscreteOpsSqlRegistry sqlRegistry = (DiscreteOpsSqlRegistry) mDiscreteRegistry;
		DiscreteOpsXmlRegistry xmlRegistry = new DiscreteOpsXmlRegistry(context);
		DiscreteOpsMigrationHelper.migrateDiscreteOpsToSqlite(xmlRegistry, sqlRegistry);
		}
		} else {
		mDiscreteRegistry = new DiscreteOpsXmlRegistry(context);
		if (DiscreteOpsDbHelper.getDatabaseFile().exists()) { // roll-back sqlite
		DiscreteOpsSqlRegistry sqlRegistry = new DiscreteOpsSqlRegistry(context);
		DiscreteOpsXmlRegistry xmlRegistry = (DiscreteOpsXmlRegistry) mDiscreteRegistry;
		DiscreteOpsMigrationHelper.migrateDiscreteOpsToXml(sqlRegistry, xmlRegistry);
		}
		}
		}

		@@ -267,6 +257,19 @@ final class HistoricalRegistry {
		}
		}
		}
		if (Flags.enableSqliteAppopsAccesses()) {
		if (DiscreteOpsXmlRegistry.getDiscreteOpsDir().exists()) {
		DiscreteOpsSqlRegistry sqlRegistry = (DiscreteOpsSqlRegistry) mDiscreteRegistry;
		DiscreteOpsXmlRegistry xmlRegistry = new DiscreteOpsXmlRegistry(mContext);
		DiscreteOpsMigrationHelper.migrateDiscreteOpsToSqlite(xmlRegistry, sqlRegistry);
		}
		} else {
		if (DiscreteOpsDbHelper.getDatabaseFile().exists()) { // roll-back sqlite
		DiscreteOpsSqlRegistry sqlRegistry = new DiscreteOpsSqlRegistry(mContext);
		DiscreteOpsXmlRegistry xmlRegistry = (DiscreteOpsXmlRegistry) mDiscreteRegistry;
		DiscreteOpsMigrationHelper.migrateDiscreteOpsToXml(sqlRegistry, xmlRegistry);
		}
		}
		}

		private boolean isPersistenceInitializedMLocked() {