Merge "AppOps SQLite minor fixes" into main (033a078e) · Commits · e / os / android_frameworks_base

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

+18 −6

Original line number	Original line	Diff line number	Diff line
	@@ -92,6 +92,7 @@ public class AppOpHistoryHelper {
	private static final int WRITE_DATABASE_PERIODIC = 1;		private static final int WRITE_DATABASE_PERIODIC = 1;
	private static final int DELETE_EXPIRED_ENTRIES_PERIODIC = 2;		private static final int DELETE_EXPIRED_ENTRIES_PERIODIC = 2;
	private static final int WRITE_DATABASE_CACHE_FULL = 3;		private static final int WRITE_DATABASE_CACHE_FULL = 3;
			private static final int CLOSE_DATABASE_ON_SHUTDOWN = 4;
	// Used in adding variation to periodic job interval		// Used in adding variation to periodic job interval
	private final Random mRandom = new Random();		private final Random mRandom = new Random();
	// time window interval for aggregation		// time window interval for aggregation
	@@ -275,13 +276,18 @@ public class AppOpHistoryHelper {
	}		}

	void shutdown() {		void shutdown() {
	mSqliteWriteHandler.removeAllPendingMessages();		persistPendingHistory();
	insertAppOpHistory(mCache.evictAll(),
	SQLITE_APP_OP_EVENT_REPORTED__WRITE_TYPE__WRITE_SHUTDOWN);
	// Remove pending delayed message.		// Remove pending delayed message.
	mMetricHandler.removeMessages(MetricHandler.SEND_EVENTS);		mMetricHandler.removeMessages(MetricHandler.SEND_EVENTS);
	mMetricHandler.sendEmptyMessage(MetricHandler.SEND_EVENTS);		mMetricHandler.sendEmptyMessage(MetricHandler.SEND_EVENTS);
	mDbHelper.close();		mSqliteWriteHandler.sendEmptyMessage(CLOSE_DATABASE_ON_SHUTDOWN);
			}

			// Write app op records from cache to the database.
			void persistPendingHistory() {
			mSqliteWriteHandler.removeAllPendingMessages();
			insertAppOpHistory(mCache.evictAll(),
			SQLITE_APP_OP_EVENT_REPORTED__WRITE_TYPE__WRITE_SHUTDOWN);
	}		}

	void clearHistory() {		void clearHistory() {
	@@ -467,6 +473,9 @@ public class AppOpHistoryHelper {
	ensurePeriodicJobsAreScheduled();		ensurePeriodicJobsAreScheduled();
	}		}
	}		}
			case CLOSE_DATABASE_ON_SHUTDOWN -> {
			mDbHelper.close();
			}
	}		}
	}		}

	@@ -668,13 +677,16 @@ public class AppOpHistoryHelper {
	* 4) During shutdown.		* 4) During shutdown.
	*/		*/
	class AppOpHistoryCache {		class AppOpHistoryCache {
	private static final String TAG = "AppOpHistoryCache";
	private final int mCapacity;		private final int mCapacity;
	private final ArrayMap<AppOpAccessEvent, AggregatedAppOpValues> mCache;		private final ArrayMap<AppOpAccessEvent, AggregatedAppOpValues> mCache;

	AppOpHistoryCache(int capacity) {		AppOpHistoryCache(int capacity) {
	mCapacity = capacity;		mCapacity = capacity;
	mCache = new ArrayMap<>();		// The initial capacity is set to 64 as a balanced compromise between performance
			// and memory usage for handling small bursts of app op events.
			// For example, the capacity of 32 would require three consecutive array expansions
			// to accommodate a 50 event burst, as the capacity grows from 32 → 48 → 72 → 108.
			mCache = new ArrayMap<>(64);
	}		}

	/**		/**

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -680,8 +680,8 @@ public class HistoricalRegistry implements HistoricalRegistryInterface {
	if (isNotReadyOrDisabled()) {		if (isNotReadyOrDisabled()) {
	return;		return;
	}		}
	mLongIntervalHistoryHelper.shutdown();		mLongIntervalHistoryHelper.persistPendingHistory();
	mShortIntervalHistoryHelper.shutdown();		mShortIntervalHistoryHelper.persistPendingHistory();
	}		}

	@Override		@Override

services/tests/servicestests/src/com/android/server/appop/DiscreteOpsMigrationAndRollbackTest.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -178,7 +178,7 @@ public class DiscreteOpsMigrationAndRollbackTest {
	ATTRIBUTION_FLAG_ACCESSOR, i, 1, false);		ATTRIBUTION_FLAG_ACCESSOR, i, 1, false);
	}		}
	// flush records from cache to the database.		// flush records from cache to the database.
	appOpHistoryHelper.shutdown();		appOpHistoryHelper.persistPendingHistory();
	assertThat(appOpHistoryHelper.getAppOpHistory().size()).isEqualTo(RECORD_COUNT);		assertThat(appOpHistoryHelper.getAppOpHistory().size()).isEqualTo(RECORD_COUNT);
	assertThat(appOpHistoryHelper.getLargestAttributionChainId()).isEqualTo(RECORD_COUNT);		assertThat(appOpHistoryHelper.getLargestAttributionChainId()).isEqualTo(RECORD_COUNT);

	@@ -248,7 +248,7 @@ public class DiscreteOpsMigrationAndRollbackTest {
	ATTRIBUTION_FLAG_ACCESSOR, i, 1, false);		ATTRIBUTION_FLAG_ACCESSOR, i, 1, false);
	}		}
	// flush records from cache to the database.		// flush records from cache to the database.
	appOpHistoryHelper.shutdown();		appOpHistoryHelper.persistPendingHistory();
	assertThat(appOpHistoryHelper.getAppOpHistory().size()).isEqualTo(RECORD_COUNT);		assertThat(appOpHistoryHelper.getAppOpHistory().size()).isEqualTo(RECORD_COUNT);
	assertThat(appOpHistoryHelper.getLargestAttributionChainId()).isEqualTo(RECORD_COUNT);		assertThat(appOpHistoryHelper.getLargestAttributionChainId()).isEqualTo(RECORD_COUNT);