Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Reduce dropbox entries on lowram devices from 1000 to 300" into oc-mr1-dev

Browse Source 
am: ac1924ce18

Change-Id: I28c844b69323c1c3a304865ebd942f09c22ef585
This commit is contained in:
Makoto Onuki
2017-08-23 10:14:23 +00:00
committed by android-build-merger
parent 74a9179cb9 ac1924ce18
commit 194abbd418
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/DropBoxManagerService.java
View File

@@ -16,6 +16,7 @@
package com.android.server; package com.android.server;
import android.app.ActivityManager;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
@@ -70,6 +71,7 @@ public final class DropBoxManagerService extends SystemService {
private static final String TAG = "DropBoxManagerService"; private static final String TAG = "DropBoxManagerService";
private static final int DEFAULT_AGE_SECONDS = 3 * 86400; private static final int DEFAULT_AGE_SECONDS = 3 * 86400;
private static final int DEFAULT_MAX_FILES = 1000; private static final int DEFAULT_MAX_FILES = 1000;
private static final int DEFAULT_MAX_FILES_LOWRAM = 300;
private static final int DEFAULT_QUOTA_KB = 5 * 1024; private static final int DEFAULT_QUOTA_KB = 5 * 1024;
private static final int DEFAULT_QUOTA_PERCENT = 10; private static final int DEFAULT_QUOTA_PERCENT = 10;
private static final int DEFAULT_RESERVE_PERCENT = 10; private static final int DEFAULT_RESERVE_PERCENT = 10;
@@ -106,6 +108,8 @@ public final class DropBoxManagerService extends SystemService {
// Provide a way to perform sendBroadcast asynchronously to avoid deadlocks. // Provide a way to perform sendBroadcast asynchronously to avoid deadlocks.
private final Handler mHandler; private final Handler mHandler;
private int mMaxFiles = -1; // -1 means uninitialized.
/** Receives events that might indicate a need to clean up files. */ /** Receives events that might indicate a need to clean up files. */
private final BroadcastReceiver mReceiver = new BroadcastReceiver() { private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
@Override @Override
@@ -394,6 +398,7 @@ public final class DropBoxManagerService extends SystemService {
} }
out.append("Drop box contents: ").append(mAllFiles.contents.size()).append(" entries\n"); out.append("Drop box contents: ").append(mAllFiles.contents.size()).append(" entries\n");
out.append("Max entries: ").append(mMaxFiles).append("\n");
if (!searchArgs.isEmpty()) { if (!searchArgs.isEmpty()) {
out.append("Searching for:"); out.append("Searching for:");
@@ -819,12 +824,16 @@ public final class DropBoxManagerService extends SystemService {
int ageSeconds = Settings.Global.getInt(mContentResolver, int ageSeconds = Settings.Global.getInt(mContentResolver,
Settings.Global.DROPBOX_AGE_SECONDS, DEFAULT_AGE_SECONDS); Settings.Global.DROPBOX_AGE_SECONDS, DEFAULT_AGE_SECONDS);
int maxFiles = Settings.Global.getInt(mContentResolver, mMaxFiles = Settings.Global.getInt(mContentResolver,
Settings.Global.DROPBOX_MAX_FILES, DEFAULT_MAX_FILES); Settings.Global.DROPBOX_MAX_FILES,
(ActivityManager.isLowRamDeviceStatic()
? DEFAULT_MAX_FILES_LOWRAM : DEFAULT_MAX_FILES));
long cutoffMillis = System.currentTimeMillis() - ageSeconds * 1000; long cutoffMillis = System.currentTimeMillis() - ageSeconds * 1000;
while (!mAllFiles.contents.isEmpty()) { while (!mAllFiles.contents.isEmpty()) {
EntryFile entry = mAllFiles.contents.first(); EntryFile entry = mAllFiles.contents.first();
if (entry.timestampMillis > cutoffMillis && mAllFiles.contents.size() < maxFiles) break; if (entry.timestampMillis > cutoffMillis && mAllFiles.contents.size() < mMaxFiles) {
break;
}
FileList tag = mFilesByTag.get(entry.tag); FileList tag = mFilesByTag.get(entry.tag);
if (tag != null && tag.contents.remove(entry)) tag.blocks -= entry.blocks; if (tag != null && tag.contents.remove(entry)) tag.blocks -= entry.blocks;