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

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

Merge "Avoid TransferPipe for local dumpCacheInfo calls" into sc-dev am: 1e696cb9 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib5b6f8d792bdfb9980313b088352e38b1821696e
parents 678b61f6 1e696cb9

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

+5 −0
Original line number Diff line number Diff line
@@ -173,6 +173,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.BackupManager.OperationType;

import android.app.backup.IBackupManager;
@@ -9872,6 +9873,10 @@ public class ActivityManagerService extends IActivityManager.Stub 
            if (thread != null) {

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

                pw.flush();

                if (pid == MY_PID) {

                    PropertyInvalidatedCache.dumpCacheInfo(fd, args);

                    continue;

                }

                try {

                    TransferPipe tp = new TransferPipe();

                    try {