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

Commit 2dd43b09 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 30d4de76: am 8a0de58e: Get ProcessStats callable from other processes. 

* commit '30d4de76':
  Get ProcessStats callable from other processes.
parents 8ffe6171 30d4de76

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;