Merge "Merge "Close idle connections to release RAM" into oc-mr1-dev am: da49d05a8d am: 5ee20f2b92" (3ca8034e) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/locksettings/LockSettingsStorage.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -713,12 +713,15 @@ class LockSettingsStorage {
		private static final String DATABASE_NAME = "locksettings.db";

		private static final int DATABASE_VERSION = 2;
		private static final int IDLE_CONNECTION_TIMEOUT_MS = 30000;

		private Callback mCallback;

		public DatabaseHelper(Context context) {
		super(context, DATABASE_NAME, null, DATABASE_VERSION);
		setWriteAheadLoggingEnabled(true);
		// Memory optimization - close idle connections after 30s of inactivity
		setIdleConnectionTimeout(IDLE_CONNECTION_TIMEOUT_MS);
		}

		public void setCallback(Callback callback) {

+9 −0

Original line number	Diff line number	Diff line
		@@ -1059,6 +1059,9 @@ public class NotificationUsageStats {
		private static final int EVENT_TYPE_CLICK = 2;
		private static final int EVENT_TYPE_REMOVE = 3;
		private static final int EVENT_TYPE_DISMISS = 4;

		private static final int IDLE_CONNECTION_TIMEOUT_MS = 30000;

		private static long sLastPruneMs;

		private static long sNumWrites;
		@@ -1140,6 +1143,12 @@ public class NotificationUsageStats {
		")");
		}

		@Override
		public void onConfigure(SQLiteDatabase db) {
		// Memory optimization - close idle connections after 30s of inactivity
		setIdleConnectionTimeout(IDLE_CONNECTION_TIMEOUT_MS);
		}

		@Override
		public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
		if (oldVersion != newVersion) {