Merge "Close idle connections to release RAM" into oc-mr1-dev

am: da49d05a8d

Change-Id: I4864a0c7e62406e7ee56136c292b0d1d13867443
This commit is contained in:
Fyodor Kupolov
2017-09-06 18:48:05 +00:00
committed by android-build-merger
2 changed files with 12 additions and 0 deletions

View File

@@ -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) {

View File

@@ -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) {