aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFyodor Kupolov <fkupolov@google.com>2017-09-02 00:01:59 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-09-02 00:01:59 +0000
commit5ffa3ca78cda0c08bc8bce857956716c3eb600c3 (patch)
treea229b4b1d0629e5e19477d3f21715961d42209cc
parent4d28289652375514026d1e99f23a63586ee8d835 (diff)
parent2724dead51116d8281433435ba9e152f839fac4c (diff)
downloadContactsProvider-5ffa3ca78cda0c08bc8bce857956716c3eb600c3.tar.gz
Close idle connections to release RAM
am: 2724dead51 Change-Id: I3d474852cc6980a9cf981f982c4348f60210de76
-rw-r--r--src/com/android/providers/contacts/CallLogDatabaseHelper.java4
-rw-r--r--src/com/android/providers/contacts/ContactsDatabaseHelper.java4
2 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/providers/contacts/CallLogDatabaseHelper.java b/src/com/android/providers/contacts/CallLogDatabaseHelper.java
index d4ed9304..736d6657 100644
--- a/src/com/android/providers/contacts/CallLogDatabaseHelper.java
+++ b/src/com/android/providers/contacts/CallLogDatabaseHelper.java
@@ -47,6 +47,8 @@ public class CallLogDatabaseHelper {
private static final String SHADOW_DATABASE_NAME = "calllog_shadow.db";
+ private static final int IDLE_CONNECTION_TIMEOUT_MS = 30000;
+
private static CallLogDatabaseHelper sInstance;
/** Instance for the "shadow" provider. */
@@ -87,6 +89,8 @@ public class CallLogDatabaseHelper {
public OpenHelper(Context context, String name, SQLiteDatabase.CursorFactory factory,
int version) {
super(context, name, factory, version);
+ // Memory optimization - close idle connections after 30s of inactivity
+ setIdleConnectionTimeout(IDLE_CONNECTION_TIMEOUT_MS);
}
@Override
diff --git a/src/com/android/providers/contacts/ContactsDatabaseHelper.java b/src/com/android/providers/contacts/ContactsDatabaseHelper.java
index c45c63e3..76fe173d 100644
--- a/src/com/android/providers/contacts/ContactsDatabaseHelper.java
+++ b/src/com/android/providers/contacts/ContactsDatabaseHelper.java
@@ -144,6 +144,8 @@ public class ContactsDatabaseHelper extends SQLiteOpenHelper {
@VisibleForTesting
static final boolean DISALLOW_SUB_QUERIES = false;
+ private static final int IDLE_CONNECTION_TIMEOUT_MS = 30000;
+
public interface Tables {
public static final String CONTACTS = "contacts";
public static final String DELETED_CONTACTS = "deleted_contacts";
@@ -1064,6 +1066,8 @@ public class ContactsDatabaseHelper extends SQLiteOpenHelper {
enableWal = false;
}
setWriteAheadLoggingEnabled(enableWal);
+ // Memory optimization - close idle connections after 30s of inactivity
+ setIdleConnectionTimeout(IDLE_CONNECTION_TIMEOUT_MS);
mDatabaseOptimizationEnabled = optimizationEnabled;
mIsTestInstance = isTestInstance;
Resources resources = context.getResources();