Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e56e1f3 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am cbcf8259: am cdec187a: Merge "Whoops, need to acquire lock." into ics-mr1 

* commit 'cbcf8259':
  Whoops, need to acquire lock.
parents 29270da5 cbcf8259

data/etc/platform.xml

+1 −0
Original line number Diff line number Diff line
@@ -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" />

services/java/com/android/server/am/ActivityManagerService.java

+10 −8
Original line number Diff line number Diff line
@@ -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);

                        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();