Snap for 11679388 from 73d4755e9494c4c4bd08e2c9ad99dad69d0e0f72 to 24Q3-release (a995686c) · Commits · e / os / android_frameworks_base

apex/jobscheduler/OWNERS

+0 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,6 @@ ctate@android.com
		ctate@google.com
		dplotnikov@google.com
		jji@google.com
		kwekua@google.com
		omakoto@google.com
		suprabh@google.com
		varunshah@google.com

apex/jobscheduler/framework/java/android/app/job/OWNERS

+0 −1

Original line number	Diff line number	Diff line
		@@ -4,4 +4,3 @@ yamasani@google.com
		omakoto@google.com
		ctate@android.com
		ctate@google.com
		kwekua@google.com

cmds/incident_helper/OWNERS

+0 −1

Original line number	Diff line number	Diff line
		joeo@google.com
		kwekua@google.com
		yanmin@google.com

core/api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -9877,7 +9877,7 @@ package android.companion {
		ctor public ObservingDevicePresenceRequest.Builder();
		method @NonNull public android.companion.ObservingDevicePresenceRequest build();
		method @NonNull public android.companion.ObservingDevicePresenceRequest.Builder setAssociationId(int);
		method @NonNull @RequiresPermission(android.Manifest.permission.REQUEST_OBSERVE_DEVICE_UUID_PRESENCE) public android.companion.ObservingDevicePresenceRequest.Builder setUuid(@NonNull android.os.ParcelUuid);
		method @NonNull @RequiresPermission(allOf={android.Manifest.permission.REQUEST_OBSERVE_DEVICE_UUID_PRESENCE, android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_SCAN}) public android.companion.ObservingDevicePresenceRequest.Builder setUuid(@NonNull android.os.ParcelUuid);
		}

		public final class WifiDeviceFilter implements android.companion.DeviceFilter<android.net.wifi.ScanResult> {

core/java/android/app/ActivityThread.java

+11 −2

Original line number	Diff line number	Diff line
		@@ -1082,6 +1082,8 @@ public final class ActivityThread extends ClientTransactionHandler
		public boolean managed;
		public boolean mallocInfo;
		public boolean runGc;
		// compression format to dump bitmaps, null if no bitmaps to be dumped
		public String dumpBitmaps;
		String path;
		ParcelFileDescriptor fd;
		RemoteCallback finishCallback;
		@@ -1486,11 +1488,12 @@ public final class ActivityThread extends ClientTransactionHandler
		}

		@Override
		public void dumpHeap(boolean managed, boolean mallocInfo, boolean runGc, String path,
		ParcelFileDescriptor fd, RemoteCallback finishCallback) {
		public void dumpHeap(boolean managed, boolean mallocInfo, boolean runGc, String dumpBitmaps,
		String path, ParcelFileDescriptor fd, RemoteCallback finishCallback) {
		DumpHeapData dhd = new DumpHeapData();
		dhd.managed = managed;
		dhd.mallocInfo = mallocInfo;
		dhd.dumpBitmaps = dumpBitmaps;
		dhd.runGc = runGc;
		dhd.path = path;
		try {
		@@ -6859,6 +6862,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());
		@@ -6886,6 +6892,9 @@ 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) {