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

Whoops, need to acquire lock.

Browse Source 
Also increase time between reports to try to reduce the amount
of redundant spam we get.

Change-Id: Iedd7d743826fffa62ee431073cb7dfb49a00cea0
This commit is contained in:
Dianne Hackborn
2011-11-15 15:01:14 -08:00
parent b35a21f987
commit 7aa6d31240
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/etc/platform.xml
View File

@@ -137,6 +137,7 @@
<assign-permission name="android.permission.SET_ALWAYS_FINISH" uid="shell" />
<assign-permission name="android.permission.DUMP" uid="shell" />
<assign-permission name="android.permission.SIGNAL_PERSISTENT_PROCESSES" uid="shell" />
<assign-permission name="android.permission.KILL_BACKGROUND_PROCESSES" uid="shell" />
<!-- Internal permissions granted to the shell. -->
<assign-permission name="android.permission.FORCE_BACK" uid="shell" />
<assign-permission name="android.permission.BATTERY_STATS" uid="shell" />

18
services/java/com/android/server/am/ActivityManagerService.java
View File

@@ -1211,8 +1211,8 @@ public final class ActivityManagerService extends ActivityManagerNative
}
synchronized (ActivityManagerService.this) {
long now = SystemClock.uptimeMillis();
if (now < (mLastMemUsageReportTime+10000)) {
// Don't report more than every 10 seconds to somewhat
if (now < (mLastMemUsageReportTime+5*60*1000)) {
// Don't report more than every 5 minutes to somewhat
// avoid spamming.
return;
}
@@ -1250,12 +1250,14 @@ public final class ActivityManagerService extends ActivityManagerNative
PrintWriter catPw = new PrintWriter(catSw);
String[] emptyArgs = new String[] { };
StringBuilder tag = new StringBuilder(128);
dumpProcessesLocked(null, catPw, emptyArgs, 0, false);
catPw.println();
dumpServicesLocked(null, catPw, emptyArgs, 0, false, false);
catPw.println();
dumpActivitiesLocked(null, catPw, emptyArgs, 0, false, false);
catPw.println();
synchronized (ActivityManagerService.this) {
dumpProcessesLocked(null, catPw, emptyArgs, 0, false);
catPw.println();
dumpServicesLocked(null, catPw, emptyArgs, 0, false, false);
catPw.println();
dumpActivitiesLocked(null, catPw, emptyArgs, 0, false, false);
catPw.println();
}
tag.append("Low on memory -- ");
dumpApplicationMemoryUsage(null, pw, " ", emptyArgs, true, catPw, tag);
String memUsage = sw.toString();