Merge "Avoid TransferPipe for local dumpCacheInfo calls" am: d43c415293

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I729802dba729501c639cd018b6c4d650fb48c44f
This commit is contained in:
Collin Fijalkovich
2021-02-25 21:41:44 +00:00
committed by Automerger Merge Worker

View File

@@ -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;
@@ -12844,6 +12845,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 {