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

Commit 93b0c857 authored by Collin Fijalkovich's avatar Collin Fijalkovich Committed by Automerger Merge Worker
Browse files

Merge "Avoid TransferPipe for local dumpCacheInfo calls" am: d43c4152 am: cbeda8a7 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1595394

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9614628a8ea1672e16c085cf403c24acd376b768
parents a4c042dc cbeda8a7

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

+5 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ import android.app.NotificationManager; 
import android.app.PendingIntent;

import android.app.ProcessMemoryState;

import android.app.ProfilerInfo;

import android.app.PropertyInvalidatedCache;

import android.app.WaitResult;

import android.app.backup.IBackupManager;

import android.app.usage.UsageEvents;
@@ -12842,6 +12843,10 @@ public class ActivityManagerService extends IActivityManager.Stub 
            if (r.thread != null) {

                pw.println("\n\n** Cache info for pid " + r.pid + " [" + r.processName + "] **");

                pw.flush();

                if (r.pid == MY_PID) {

                    PropertyInvalidatedCache.dumpCacheInfo(fd, args);

                    continue;

                }

                try {

                    TransferPipe tp = new TransferPipe();

                    try {