commit 192e60d39f273763054cddc13be9d4886445ea6b
author android-build-team Robot <android-build-team-robot@google.com> Thu Sep 07 07:48:07 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Sep 07 07:48:07 2017 +0000
tree b0e716333b26b82220c50d9475120a5b978c23ec
parent f7c21e8ad3c94e4f7b0b7024cb02ccdd8cb707a8
parent c1bae1896b3e67085df6602cfff2488df46b8fac

release-request-108343c4-ad88-44f9-aaa2-24d8b8a5c176-for-git_oc-mr1-release-4321077 snap-temp-L97000000100182150

Change-Id: Ifba93ba61019fba5bd59f1116dadcad54c244a8c

src/com/android/providers/media/MediaProvider.java

diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java
index 1c142d7..ec70608 100644
--- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java
@@ -394,6 +394,7 @@
             mEarlyUpgrade = earlyUpgrade;
             mObjectRemovedCallback = objectRemovedCallback;
             setWriteAheadLoggingEnabled(true);
+            setIdleConnectionTimeout(IDLE_CONNECTION_TIMEOUT_MS);
         }
 
         /**
@@ -4675,6 +4676,9 @@
     // 60 days in milliseconds (1000 * 60 * 60 * 24 * 60)
     private static final long OBSOLETE_DATABASE_DB = 5184000000L;
 
+    // Memory optimization - close idle connections after 30s of inactivity
+    private static final int IDLE_CONNECTION_TIMEOUT_MS = 30000;
+
     private HashMap<String, DatabaseHelper> mDatabases;
 
     private Handler mThumbHandler;