Merge "Add ability to dump bitmaps with `android.os.Debug.dumpHprofData()`" into main (20c9033e) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+1 −7

Original line number	Diff line number	Diff line
		@@ -7098,12 +7098,9 @@ public final class ActivityThread extends ClientTransactionHandler
		System.runFinalization();
		System.gc();
		}
		if (dhd.dumpBitmaps != null) {
		Bitmap.dumpAll(dhd.dumpBitmaps);
		}
		try (ParcelFileDescriptor fd = dhd.fd) {
		if (dhd.managed) {
		Debug.dumpHprofData(dhd.path, fd.getFileDescriptor());
		Debug.dumpHprofData(dhd.path, fd.getFileDescriptor(), dhd.dumpBitmaps);
		} else if (dhd.mallocInfo) {
		Debug.dumpNativeMallocInfo(fd.getFileDescriptor());
		} else {
		@@ -7128,9 +7125,6 @@ public final class ActivityThread extends ClientTransactionHandler
		if (dhd.finishCallback != null) {
		dhd.finishCallback.sendResult(null);
		}
		if (dhd.dumpBitmaps != null) {
		Bitmap.dumpAll(null); // clear dump
		}
		}

		final void handleDispatchPackageBroadcast(int cmd, String[] packages) {

+42 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.annotation.Nullable;
		import android.app.AppGlobals;
		import android.compat.annotation.UnsupportedAppUsage;
		import android.content.Context;
		import android.graphics.Bitmap;
		import android.util.Log;

		import com.android.internal.util.FastPrintWriter;
		@@ -2138,6 +2139,47 @@ public final class Debug
		VMDebug.dumpHprofData(fileName, fd);
		}

		/**
		* Like dumpHprofData(String), but takes an argument of bitmapFormat,
		* which can be png, jpg, webp, or null (no bitmaps in heapdump).
		*
		* @hide
		*/
		public static void dumpHprofData(String fileName, String bitmapFormat)
		throws IOException {
		try {
		if (bitmapFormat != null) {
		Bitmap.dumpAll(bitmapFormat);
		}
		VMDebug.dumpHprofData(fileName);
		} finally {
		if (bitmapFormat != null) {
		Bitmap.dumpAll(null); // clear dump data
		}
		}
		}

		/**
		* Like dumpHprofData(String, FileDescriptor), but takes an argument
		* of bitmapFormat, which can be png, jpg, webp, or null (no bitmaps
		* in heapdump).
		*
		* @hide
		*/
		public static void dumpHprofData(String fileName, FileDescriptor fd,
		String bitmapFormat) throws IOException {
		try {
		if (bitmapFormat != null) {
		Bitmap.dumpAll(bitmapFormat);
		}
		VMDebug.dumpHprofData(fileName, fd);
		} finally {
		if (bitmapFormat != null) {
		Bitmap.dumpAll(null); // clear dump data
		}
		}
		}

		/**
		* Collect "hprof" and send it to DDMS. This may cause a GC.
		*