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

Commit 8a0de58e authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Get ProcessStats callable from other processes. 

Also fix a bug where, when parceling the stats, we were
computing the final duration values too late.  We need to
do that before we write the long table.

Change-Id: Idb6c1ed95417448c56973fe5866bfb3570e525f4
parent 8ffe17ae

core/java/android/app/ActivityManager.java

+2 −6
Original line number Diff line number Diff line
@@ -16,14 +16,13 @@ 


package android.app;



import android.R;

import android.os.BatteryStats;

import android.os.IBinder;

import com.android.internal.app.IUsageStats;

import com.android.internal.app.ProcessStats;

import com.android.internal.os.PkgUsageStats;

import com.android.internal.os.TransferPipe;

import com.android.internal.util.FastPrintWriter;

import com.android.internal.util.MemInfoReader;



import android.content.ComponentName;

import android.content.Context;
@@ -35,9 +34,7 @@ import android.content.pm.PackageManager; 
import android.content.pm.UserInfo;

import android.content.res.Resources;

import android.graphics.Bitmap;

import android.graphics.Point;

import android.graphics.Rect;

import android.hardware.display.DisplayManagerGlobal;

import android.os.Bundle;

import android.os.Debug;

import android.os.Handler;
@@ -52,7 +49,6 @@ import android.text.TextUtils; 
import android.util.DisplayMetrics;

import android.util.Log;

import android.util.Slog;

import android.view.Display;



import java.io.FileDescriptor;

import java.io.FileOutputStream;
@@ -2253,7 +2249,7 @@ public class ActivityManager { 
        PrintWriter pw = new FastPrintWriter(fout);

        dumpService(pw, fd, Context.ACTIVITY_SERVICE, new String[] { "package", packageName });

        pw.println();

        dumpService(pw, fd, "procstats", new String[] { packageName });

        dumpService(pw, fd, ProcessStats.SERVICE_NAME, new String[] { packageName });

        pw.println();

        dumpService(pw, fd, "usagestats", new String[] { "--packages", packageName });

        pw.println();

core/java/android/os/BatteryStats.java

+2 −1
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ public abstract class BatteryStats implements Parcelable { 
    private static final String BATTERY_LEVEL_DATA = "lv";

    private static final String WIFI_DATA = "wfl";

    private static final String MISC_DATA = "m";

    private static final String HISTORY_DATA = "h";

    private static final String SCREEN_BRIGHTNESS_DATA = "br";

    private static final String SIGNAL_STRENGTH_TIME_DATA = "sgt";

    private static final String SIGNAL_SCANNING_TIME_DATA = "sst";
@@ -2390,7 +2391,7 @@ public abstract class BatteryStats implements Parcelable { 
            while (getNextHistoryLocked(rec)) {

                pw.print(BATTERY_STATS_CHECKIN_VERSION); pw.print(',');

                pw.print(0); pw.print(',');

                pw.print("h"); pw.print(',');

                pw.print(HISTORY_DATA); pw.print(',');

                hprinter.printNextItemCheckin(pw, rec, now);

                pw.println();

            }

services/java/com/android/server/ProcessMap.java→core/java/com/android/internal/app/ProcessMap.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.server;

package com.android.internal.app;



import android.util.ArrayMap;

import android.util.SparseArray;

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

+3 −23
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ import com.android.internal.util.MemInfoReader; 
import com.android.server.AppOpsService;

import com.android.server.AttributeCache;

import com.android.server.IntentResolver;

import com.android.server.ProcessMap;

import com.android.internal.app.ProcessMap;

import com.android.server.SystemServer;

import com.android.server.Watchdog;

import com.android.server.am.ActivityStack.ActivityState;
@@ -1554,11 +1554,11 @@ public final class ActivityManagerService extends ActivityManagerNative 
        try {

            ActivityManagerService m = mSelf;













            ServiceManager.addService("activity", m, true);













            ServiceManager.addService(Context.ACTIVITY_SERVICE, m, true);













            ServiceManager.addService(ProcessStats.SERVICE_NAME, m.mProcessStats);















            ServiceManager.addService("meminfo", new MemBinder(m));















            ServiceManager.addService("gfxinfo", new GraphicsBinder(m));















            ServiceManager.addService("dbinfo", new DbBinder(m));













            ServiceManager.addService("procstats", new ProcBinder(m));















            if (MONITOR_CPU_USAGE) {















                ServiceManager.addService("cpuinfo", new CpuBinder(m));















            }










@@ -1775,26 +1775,6 @@ public final class ActivityManagerService extends ActivityManagerNative













        }















    }



























    static class ProcBinder extends Binder {













        ActivityManagerService mActivityManagerService;













        ProcBinder(ActivityManagerService activityManagerService) {













            mActivityManagerService = activityManagerService;













        }

























        @Override













        protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {













            if (mActivityManagerService.checkCallingPermission(android.Manifest.permission.DUMP)













                    != PackageManager.PERMISSION_GRANTED) {













                pw.println("Permission Denial: can't dump procstats from from pid="













                        + Binder.getCallingPid() + ", uid=" + Binder.getCallingUid()













                        + " without permission " + android.Manifest.permission.DUMP);













                return;













            }

























            mActivityManagerService.mProcessStats.dump(fd, pw, args);













        }













    }



























    private ActivityManagerService() {















        Slog.i(TAG, "Memory class: " + ActivityManager.staticGetMemoryClass());