Merge changes from topic "discrete-ops-sqlite" into main (a05b53f6) · Commits · e / os / android_frameworks_base

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -359,7 +359,7 @@ public class AppOpsService extends IAppOpsService.Stub {
		private static final Duration RATE_LIMITER_WINDOW = Duration.ofMillis(10);
		private final RateLimiter mRateLimiter = new RateLimiter(RATE_LIMITER_WINDOW);

		volatile @NonNull HistoricalRegistry mHistoricalRegistry = new HistoricalRegistry(this);
		volatile @NonNull HistoricalRegistry mHistoricalRegistry;

		/*
		* These are app op restrictions imposed per user from various parties.
		@@ -1039,6 +1039,8 @@ public class AppOpsService extends IAppOpsService.Stub {
		// will not exist and the nonce will be UNSET.
		AppOpsManager.invalidateAppOpModeCache();
		AppOpsManager.disableAppOpModeCache();

		mHistoricalRegistry = new HistoricalRegistry(this, context);
		}

		public void publish() {

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

+6 −5

Original line number	Diff line number	Diff line
		@@ -113,7 +113,7 @@ final class AttributedOp {
		mAppOpsService.mHistoricalRegistry.incrementOpAccessedCount(parent.op, parent.uid,
		parent.packageName, persistentDeviceId, tag, uidState, flags, accessTime,
		AppOpsManager.ATTRIBUTION_FLAGS_NONE, AppOpsManager.ATTRIBUTION_CHAIN_ID_NONE,
		DiscreteRegistry.ACCESS_TYPE_NOTE_OP, accessCount);
		DiscreteOpsRegistry.ACCESS_TYPE_NOTE_OP, accessCount);
		}

		/**
		@@ -257,7 +257,8 @@ final class AttributedOp {
		if (isStarted) {
		mAppOpsService.mHistoricalRegistry.incrementOpAccessedCount(parent.op, parent.uid,
		parent.packageName, persistentDeviceId, tag, uidState, flags, startTime,
		attributionFlags, attributionChainId, DiscreteRegistry.ACCESS_TYPE_START_OP, 1);
		attributionFlags, attributionChainId,
		DiscreteOpsRegistry.ACCESS_TYPE_START_OP, 1);
		}
		}

		@@ -344,8 +345,8 @@ final class AttributedOp {
		parent.packageName, persistentDeviceId, tag, event.getUidState(),
		event.getFlags(), finishedEvent.getNoteTime(), finishedEvent.getDuration(),
		event.getAttributionFlags(), event.getAttributionChainId(),
		isPausing ? DiscreteRegistry.ACCESS_TYPE_PAUSE_OP
		: DiscreteRegistry.ACCESS_TYPE_FINISH_OP);
		isPausing ? DiscreteOpsRegistry.ACCESS_TYPE_PAUSE_OP
		: DiscreteOpsRegistry.ACCESS_TYPE_FINISH_OP);

		if (!isPausing) {
		mAppOpsService.mInProgressStartOpEventPool.release(event);
		@@ -453,7 +454,7 @@ final class AttributedOp {
		mAppOpsService.mHistoricalRegistry.incrementOpAccessedCount(parent.op, parent.uid,
		parent.packageName, persistentDeviceId, tag, event.getUidState(),
		event.getFlags(), startTime, event.getAttributionFlags(),
		event.getAttributionChainId(), DiscreteRegistry.ACCESS_TYPE_RESUME_OP, 1);
		event.getAttributionChainId(), DiscreteOpsRegistry.ACCESS_TYPE_RESUME_OP, 1);
		if (shouldSendActive) {
		mAppOpsService.scheduleOpActiveChangedIfNeededLocked(parent.op, parent.uid,
		parent.packageName, tag, event.getVirtualDeviceId(), true,

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

0 → 100644

+387 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.server.appop;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.app.AppOpsManager;
		import android.content.Context;
		import android.database.DatabaseErrorHandler;
		import android.database.DefaultDatabaseErrorHandler;
		import android.database.sqlite.SQLiteDatabase;
		import android.database.sqlite.SQLiteException;
		import android.database.sqlite.SQLiteOpenHelper;
		import android.database.sqlite.SQLiteRawStatement;
		import android.os.Environment;
		import android.util.IntArray;
		import android.util.Slog;

		import java.io.File;
		import java.util.ArrayList;
		import java.util.List;

		class DiscreteOpsDbHelper extends SQLiteOpenHelper {
		private static final String LOG_TAG = "DiscreteOpsDbHelper";
		static final String DATABASE_NAME = "app_op_history.db";
		private static final int DATABASE_VERSION = 1;
		private static final boolean DEBUG = false;

		DiscreteOpsDbHelper(@NonNull Context context, @NonNull File databaseFile) {
		super(context, databaseFile.getAbsolutePath(), null, DATABASE_VERSION,
		new DiscreteOpsDatabaseErrorHandler());
		setOpenParams(getDatabaseOpenParams());
		}

		private static SQLiteDatabase.OpenParams getDatabaseOpenParams() {
		return new SQLiteDatabase.OpenParams.Builder()
		.addOpenFlags(SQLiteDatabase.ENABLE_WRITE_AHEAD_LOGGING)
		.build();
		}

		@NonNull
		static File getDatabaseFile() {
		return new File(new File(Environment.getDataSystemDirectory(), "appops"), DATABASE_NAME);
		}

		@Override
		public void onConfigure(SQLiteDatabase db) {
		db.execSQL("PRAGMA synchronous = NORMAL");
		}

		@Override
		public void onCreate(SQLiteDatabase db) {
		db.execSQL(DiscreteOpsTable.CREATE_TABLE_SQL);
		db.execSQL(DiscreteOpsTable.CREATE_INDEX_SQL);
		}

		@Override
		public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
		}

		void insertDiscreteOps(@NonNull List<DiscreteOpsSqlRegistry.DiscreteOp> opEvents) {
		if (opEvents.isEmpty()) {
		return;
		}

		SQLiteDatabase db = getWritableDatabase();
		// TODO (b/383157289) what if database is busy and can't start a transaction? will read
		// more about it and can be done in a follow up cl.
		db.beginTransaction();
		try (SQLiteRawStatement statement = db.createRawStatement(
		DiscreteOpsTable.INSERT_TABLE_SQL)) {
		for (DiscreteOpsSqlRegistry.DiscreteOp event : opEvents) {
		try {
		statement.bindInt(DiscreteOpsTable.UID_INDEX, event.getUid());
		bindTextOrNull(statement, DiscreteOpsTable.PACKAGE_NAME_INDEX,
		event.getPackageName());
		bindTextOrNull(statement, DiscreteOpsTable.DEVICE_ID_INDEX,
		event.getDeviceId());
		statement.bindInt(DiscreteOpsTable.OP_CODE_INDEX, event.getOpCode());
		bindTextOrNull(statement, DiscreteOpsTable.ATTRIBUTION_TAG_INDEX,
		event.getAttributionTag());
		statement.bindLong(DiscreteOpsTable.ACCESS_TIME_INDEX, event.getAccessTime());
		statement.bindLong(
		DiscreteOpsTable.ACCESS_DURATION_INDEX, event.getDuration());
		statement.bindInt(DiscreteOpsTable.UID_STATE_INDEX, event.getUidState());
		statement.bindInt(DiscreteOpsTable.OP_FLAGS_INDEX, event.getOpFlags());
		statement.bindInt(DiscreteOpsTable.ATTRIBUTION_FLAGS_INDEX,
		event.getAttributionFlags());
		statement.bindLong(DiscreteOpsTable.CHAIN_ID_INDEX, event.getChainId());
		statement.step();
		} catch (Exception exception) {
		Slog.e(LOG_TAG, "Error inserting the discrete op: " + event, exception);
		} finally {
		statement.reset();
		}
		}
		db.setTransactionSuccessful();
		} finally {
		db.endTransaction();
		}
		}

		private void bindTextOrNull(SQLiteRawStatement statement, int index, @Nullable String text) {
		if (text == null) {
		statement.bindNull(index);
		} else {
		statement.bindText(index, text);
		}
		}

		/**
		* This will be used as an offset for inserting new chain id in discrete ops table.
		*/
		long getLargestAttributionChainId() {
		long chainId = 0;
		try {
		SQLiteDatabase db = getReadableDatabase();
		db.beginTransactionReadOnly();
		try (SQLiteRawStatement statement =
		db.createRawStatement(DiscreteOpsTable.SELECT_MAX_ATTRIBUTION_CHAIN_ID)) {
		if (statement.step()) {
		chainId = statement.getColumnLong(0);
		if (chainId < 0) {
		chainId = 0;
		}
		}
		db.setTransactionSuccessful();
		} finally {
		db.endTransaction();
		}
		} catch (SQLiteException exception) {
		Slog.e(LOG_TAG, "Error reading attribution chain id", exception);
		}
		return chainId;
		}

		void execSQL(@NonNull String sql) {
		execSQL(sql, null);
		}

		void execSQL(@NonNull String sql, Object[] bindArgs) {
		if (DEBUG) {
		Slog.i(LOG_TAG, "DB execSQL, sql: " + sql);
		}
		SQLiteDatabase db = getWritableDatabase();
		if (bindArgs == null) {
		db.execSQL(sql);
		} else {
		db.execSQL(sql, bindArgs);
		}
		}

		/**
		* Returns a list of {@link DiscreteOpsSqlRegistry.DiscreteOp} based on the given filters.
		*/
		List<DiscreteOpsSqlRegistry.DiscreteOp> getDiscreteOps(
		@AppOpsManager.HistoricalOpsRequestFilter int requestFilters,
		int uidFilter, @Nullable String packageNameFilter,
		@Nullable String attributionTagFilter, IntArray opCodesFilter, int opFlagsFilter,
		long beginTime, long endTime, int limit, String orderByColumn) {
		List<SQLCondition> conditions = prepareConditions(beginTime, endTime, requestFilters,
		uidFilter, packageNameFilter,
		attributionTagFilter, opCodesFilter, opFlagsFilter);
		String sql = buildSql(conditions, orderByColumn, limit);

		SQLiteDatabase db = getReadableDatabase();
		List<DiscreteOpsSqlRegistry.DiscreteOp> results = new ArrayList<>();
		db.beginTransactionReadOnly();
		try (SQLiteRawStatement statement = db.createRawStatement(sql)) {
		int size = conditions.size();
		for (int i = 0; i < size; i++) {
		SQLCondition condition = conditions.get(i);
		if (DEBUG) {
		Slog.i(LOG_TAG, condition + ", binding value = " + condition.mFilterValue);
		}
		switch (condition.mColumnFilter) {
		case PACKAGE_NAME, ATTR_TAG -> statement.bindText(i + 1,
		condition.mFilterValue.toString());
		case UID, OP_CODE_EQUAL, OP_FLAGS -> statement.bindInt(i + 1,
		Integer.parseInt(condition.mFilterValue.toString()));
		case BEGIN_TIME, END_TIME -> statement.bindLong(i + 1,
		Long.parseLong(condition.mFilterValue.toString()));
		case OP_CODE_IN -> Slog.d(LOG_TAG, "No binding for In operator");
		default -> Slog.w(LOG_TAG, "unknown sql condition " + condition);
		}
		}

		while (statement.step()) {
		int uid = statement.getColumnInt(0);
		String packageName = statement.getColumnText(1);
		String deviceId = statement.getColumnText(2);
		int opCode = statement.getColumnInt(3);
		String attributionTag = statement.getColumnText(4);
		long accessTime = statement.getColumnLong(5);
		long duration = statement.getColumnLong(6);
		int uidState = statement.getColumnInt(7);
		int opFlags = statement.getColumnInt(8);
		int attributionFlags = statement.getColumnInt(9);
		long chainId = statement.getColumnLong(10);
		DiscreteOpsSqlRegistry.DiscreteOp event = new DiscreteOpsSqlRegistry.DiscreteOp(uid,
		packageName, attributionTag, deviceId, opCode,
		opFlags, attributionFlags, uidState, chainId, accessTime, duration);
		results.add(event);
		}
		db.setTransactionSuccessful();
		} finally {
		db.endTransaction();
		}
		return results;
		}

		private String buildSql(List<SQLCondition> conditions, String orderByColumn, int limit) {
		StringBuilder sql = new StringBuilder(DiscreteOpsTable.SELECT_TABLE_DATA);
		if (!conditions.isEmpty()) {
		sql.append(" WHERE ");
		int size = conditions.size();
		for (int i = 0; i < size; i++) {
		sql.append(conditions.get(i).toString());
		if (i < size - 1) {
		sql.append(" AND ");
		}
		}
		}

		if (orderByColumn != null) {
		sql.append(" ORDER BY ").append(orderByColumn);
		}
		if (limit > 0) {
		sql.append(" LIMIT ").append(limit);
		}
		if (DEBUG) {
		Slog.i(LOG_TAG, "Sql query " + sql);
		}
		return sql.toString();
		}

		/**
		* Creates where conditions for package, uid, attribution tag and app op codes,
		* app op codes condition does not support argument binding.
		*/
		private List<SQLCondition> prepareConditions(long beginTime, long endTime, int requestFilters,
		int uid, @Nullable String packageName, @Nullable String attributionTag,
		IntArray opCodes, int opFlags) {
		final List<SQLCondition> conditions = new ArrayList<>();

		if (beginTime != -1) {
		conditions.add(new SQLCondition(ColumnFilter.BEGIN_TIME, beginTime));
		}
		if (endTime != -1) {
		conditions.add(new SQLCondition(ColumnFilter.END_TIME, endTime));
		}
		if (opFlags != 0) {
		conditions.add(new SQLCondition(ColumnFilter.OP_FLAGS, opFlags));
		}

		if (requestFilters != 0) {
		if ((requestFilters & AppOpsManager.FILTER_BY_PACKAGE_NAME) != 0) {
		conditions.add(new SQLCondition(ColumnFilter.PACKAGE_NAME, packageName));
		}
		if ((requestFilters & AppOpsManager.FILTER_BY_UID) != 0) {
		conditions.add(new SQLCondition(ColumnFilter.UID, uid));

		}
		if ((requestFilters & AppOpsManager.FILTER_BY_ATTRIBUTION_TAG) != 0) {
		conditions.add(new SQLCondition(ColumnFilter.ATTR_TAG, attributionTag));
		}
		// filter op codes
		if (opCodes != null && opCodes.size() == 1) {
		conditions.add(new SQLCondition(ColumnFilter.OP_CODE_EQUAL, opCodes.get(0)));
		} else if (opCodes != null && opCodes.size() > 1) {
		StringBuilder b = new StringBuilder();
		int size = opCodes.size();
		for (int i = 0; i < size; i++) {
		b.append(opCodes.get(i));
		if (i < size - 1) {
		b.append(", ");
		}
		}
		conditions.add(new SQLCondition(ColumnFilter.OP_CODE_IN, b.toString()));
		}
		}
		return conditions;
		}

		/**
		* This class prepares a where clause condition for discrete ops table column.
		*/
		static final class SQLCondition {
		private final ColumnFilter mColumnFilter;
		private final Object mFilterValue;

		SQLCondition(ColumnFilter columnFilter, Object filterValue) {
		mColumnFilter = columnFilter;
		mFilterValue = filterValue;
		}

		@Override
		public String toString() {
		if (mColumnFilter == ColumnFilter.OP_CODE_IN) {
		return mColumnFilter + " ( " + mFilterValue + " )";
		}
		return mColumnFilter.toString();
		}
		}

		/**
		* This enum describes the where clause conditions for different columns in discrete ops
		* table.
		*/
		private enum ColumnFilter {
		PACKAGE_NAME(DiscreteOpsTable.Columns.PACKAGE_NAME + " = ? "),
		UID(DiscreteOpsTable.Columns.UID + " = ? "),
		ATTR_TAG(DiscreteOpsTable.Columns.ATTRIBUTION_TAG + " = ? "),
		END_TIME(DiscreteOpsTable.Columns.ACCESS_TIME + " < ? "),
		OP_CODE_EQUAL(DiscreteOpsTable.Columns.OP_CODE + " = ? "),
		BEGIN_TIME(DiscreteOpsTable.Columns.ACCESS_TIME + " + "
		+ DiscreteOpsTable.Columns.ACCESS_DURATION + " > ? "),
		OP_FLAGS("(" + DiscreteOpsTable.Columns.OP_FLAGS + " & ? ) != 0"),
		OP_CODE_IN(DiscreteOpsTable.Columns.OP_CODE + " IN ");

		final String mCondition;

		ColumnFilter(String condition) {
		mCondition = condition;
		}

		@Override
		public String toString() {
		return mCondition;
		}
		}

		static final class DiscreteOpsDatabaseErrorHandler implements DatabaseErrorHandler {
		private final DefaultDatabaseErrorHandler mDefaultDatabaseErrorHandler =
		new DefaultDatabaseErrorHandler();

		@Override
		public void onCorruption(SQLiteDatabase dbObj) {
		Slog.e(LOG_TAG, "discrete ops database got corrupted.");
		mDefaultDatabaseErrorHandler.onCorruption(dbObj);
		}
		}

		// USED for testing only
		List<DiscreteOpsSqlRegistry.DiscreteOp> getAllDiscreteOps(@NonNull String sql) {
		SQLiteDatabase db = getReadableDatabase();
		List<DiscreteOpsSqlRegistry.DiscreteOp> results = new ArrayList<>();
		db.beginTransactionReadOnly();
		try (SQLiteRawStatement statement = db.createRawStatement(sql)) {
		while (statement.step()) {
		int uid = statement.getColumnInt(0);
		String packageName = statement.getColumnText(1);
		String deviceId = statement.getColumnText(2);
		int opCode = statement.getColumnInt(3);
		String attributionTag = statement.getColumnText(4);
		long accessTime = statement.getColumnLong(5);
		long duration = statement.getColumnLong(6);
		int uidState = statement.getColumnInt(7);
		int opFlags = statement.getColumnInt(8);
		int attributionFlags = statement.getColumnInt(9);
		long chainId = statement.getColumnLong(10);
		DiscreteOpsSqlRegistry.DiscreteOp event = new DiscreteOpsSqlRegistry.DiscreteOp(uid,
		packageName, attributionTag, deviceId, opCode,
		opFlags, attributionFlags, uidState, chainId, accessTime, duration);
		results.add(event);
		}
		db.setTransactionSuccessful();
		} finally {
		db.endTransaction();
		}
		return results;
		}
		}

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

0 → 100644

+106 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.server.appop;

		import java.util.ArrayList;
		import java.util.List;

		/**
		* Helper class for migrating discrete ops from xml to sqlite
		*/
		public class DiscreteOpsMigrationHelper {
		/**
		* migrate discrete ops from xml to sqlite.
		*/
		static void migrateDiscreteOpsToSqlite(DiscreteOpsXmlRegistry xmlRegistry,
		DiscreteOpsSqlRegistry sqlRegistry) {
		DiscreteOpsXmlRegistry.DiscreteOps xmlOps = xmlRegistry.getAllDiscreteOps();
		List<DiscreteOpsSqlRegistry.DiscreteOp> discreteOps = getSqlDiscreteOps(xmlOps);
		sqlRegistry.migrateXmlData(discreteOps, xmlOps.mChainIdOffset);
		xmlRegistry.deleteDiscreteOpsDir();
		}

		/**
		* rollback discrete ops from sqlite to xml.
		*/
		static void migrateDiscreteOpsToXml(DiscreteOpsSqlRegistry sqlRegistry,
		DiscreteOpsXmlRegistry xmlRegistry) {
		List<DiscreteOpsSqlRegistry.DiscreteOp> sqlOps = sqlRegistry.getAllDiscreteOps();
		DiscreteOpsXmlRegistry.DiscreteOps xmlOps = getXmlDiscreteOps(sqlOps);
		xmlRegistry.migrateSqliteData(xmlOps);
		sqlRegistry.deleteDatabase();
		}

		/**
		* Convert sqlite flat rows to hierarchical data.
		*/
		private static DiscreteOpsXmlRegistry.DiscreteOps getXmlDiscreteOps(
		List<DiscreteOpsSqlRegistry.DiscreteOp> discreteOps) {
		DiscreteOpsXmlRegistry.DiscreteOps xmlOps =
		new DiscreteOpsXmlRegistry.DiscreteOps(0);
		if (discreteOps.isEmpty()) {
		return xmlOps;
		}

		for (DiscreteOpsSqlRegistry.DiscreteOp discreteOp : discreteOps) {
		xmlOps.addDiscreteAccess(discreteOp.getOpCode(), discreteOp.getUid(),
		discreteOp.getPackageName(), discreteOp.getDeviceId(),
		discreteOp.getAttributionTag(), discreteOp.getOpFlags(),
		discreteOp.getUidState(),
		discreteOp.getAccessTime(), discreteOp.getDuration(),
		discreteOp.getAttributionFlags(), (int) discreteOp.getChainId());
		}
		return xmlOps;
		}

		/**
		* Convert xml (hierarchical) data to flat row based data.
		*/
		private static List<DiscreteOpsSqlRegistry.DiscreteOp> getSqlDiscreteOps(
		DiscreteOpsXmlRegistry.DiscreteOps discreteOps) {
		List<DiscreteOpsSqlRegistry.DiscreteOp> opEvents = new ArrayList<>();

		if (discreteOps.isEmpty()) {
		return opEvents;
		}

		discreteOps.mUids.forEach((uid, discreteUidOps) -> {
		discreteUidOps.mPackages.forEach((packageName, packageOps) -> {
		packageOps.mPackageOps.forEach((opcode, ops) -> {
		ops.mDeviceAttributedOps.forEach((deviceId, deviceOps) -> {
		deviceOps.mAttributedOps.forEach((tag, attributedOps) -> {
		for (DiscreteOpsXmlRegistry.DiscreteOpEvent attributedOp :
		attributedOps) {
		DiscreteOpsSqlRegistry.DiscreteOp
		opModel = new DiscreteOpsSqlRegistry.DiscreteOp(uid,
		packageName, tag,
		deviceId, opcode, attributedOp.mOpFlag,
		attributedOp.mAttributionFlags,
		attributedOp.mUidState, attributedOp.mAttributionChainId,
		attributedOp.mNoteTime,
		attributedOp.mNoteDuration);
		opEvents.add(opModel);
		}
		});
		});
		});
		});
		});

		return opEvents;
		}
		}

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

0 → 100644

+298 −0

File added.

Preview size limit exceeded, changes collapsed.