drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Whoops, need to acquire lock." into ics-mr1

Browse Source
This commit is contained in:
Dianne Hackborn
2011-11-15 19:04:11 -08:00
committed by Android (Google) Code Review
parent 0ddb014389 7aa6d31240
commit cdec187a27
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.SET_ALWAYS_FINISH" uid="shell" />
<assign-permission name="android.permission.DUMP" 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.SIGNAL_PERSISTENT_PROCESSES" uid="shell" />
<assign-permission name="android.permission.KILL_BACKGROUND_PROCESSES" uid="shell" />
<!-- Internal permissions granted to the shell. --> <!-- Internal permissions granted to the shell. -->
<assign-permission name="android.permission.FORCE_BACK" uid="shell" /> <assign-permission name="android.permission.FORCE_BACK" uid="shell" />
<assign-permission name="android.permission.BATTERY_STATS" 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) { synchronized (ActivityManagerService.this) {
long now = SystemClock.uptimeMillis(); long now = SystemClock.uptimeMillis();
if (now < (mLastMemUsageReportTime+10000)) { if (now < (mLastMemUsageReportTime+5*60*1000)) {
// Don't report more than every 10 seconds to somewhat // Don't report more than every 5 minutes to somewhat
// avoid spamming. // avoid spamming.
return; return;
} }
@ -1250,12 +1250,14 @@ public final class ActivityManagerService extends ActivityManagerNative
PrintWriter catPw = new PrintWriter(catSw); PrintWriter catPw = new PrintWriter(catSw);
String[] emptyArgs = new String[] { }; String[] emptyArgs = new String[] { };
StringBuilder tag = new StringBuilder(128); StringBuilder tag = new StringBuilder(128);
dumpProcessesLocked(null, catPw, emptyArgs, 0, false); synchronized (ActivityManagerService.this) {
catPw.println(); dumpProcessesLocked(null, catPw, emptyArgs, 0, false);
dumpServicesLocked(null, catPw, emptyArgs, 0, false, false); catPw.println();
catPw.println(); dumpServicesLocked(null, catPw, emptyArgs, 0, false, false);
dumpActivitiesLocked(null, catPw, emptyArgs, 0, false, false); catPw.println();
catPw.println(); dumpActivitiesLocked(null, catPw, emptyArgs, 0, false, false);
catPw.println();
}
tag.append("Low on memory -- "); tag.append("Low on memory -- ");
dumpApplicationMemoryUsage(null, pw, " ", emptyArgs, true, catPw, tag); dumpApplicationMemoryUsage(null, pw, " ", emptyArgs, true, catPw, tag);
String memUsage = sw.toString(); String memUsage = sw.toString();