Snap for 11931036 from 438d8ad3c4f35c7ff7f9822c4e58b2e27ee5fc23 to 24Q3-release (46062ae6) · Commits · e / os / android_frameworks_base

cmds/bootanimation/BootAnimation.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -1335,7 +1335,8 @@ bool BootAnimation::preloadZip(Animation& animation) {
		if (path.string() == animation.parts[j].path.c_str()) {
		uint16_t method;
		// supports only stored png files
		if (zip->getEntryInfo(entry, &method, nullptr, nullptr, nullptr, nullptr, nullptr)) {
		if (zip->getEntryInfo(entry, &method, nullptr, nullptr, nullptr, nullptr,
		nullptr, nullptr)) {
		if (method == ZipFileRO::kCompressStored) {
		FileMap* map = zip->createEntryFileMap(entry);
		if (map) {

+2 −12

Original line number	Diff line number	Diff line
		@@ -1101,19 +1101,9 @@ public abstract class ActivityManagerInternal {
		public abstract ArraySet<String> getClientPackages(String servicePackageName);

		/**
		* Retrieve an IUnsafeIntentStrictModeCallback matching the given callingUid.
		* Returns null no match is found.
		* @param callingPid The PID mapped with the callback.
		* @return The callback, if it exists.
		* Trigger an unsafe intent usage strict mode violation.
		*/
		public abstract IUnsafeIntentStrictModeCallback getRegisteredStrictModeCallback(
		int callingPid);

		/**
		* Unregisters an IUnsafeIntentStrictModeCallback matching the given callingUid.
		* @param callingPid The PID mapped with the callback.
		*/
		public abstract void unregisterStrictModeCallback(int callingPid);
		public abstract void triggerUnsafeIntentStrictMode(int callingPid, int type, Intent intent);

		/**
		* Start a foreground service delegate.

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,5 +24,5 @@ import android.content.Intent;
		*/
		oneway interface IUnsafeIntentStrictModeCallback
		{
		void onImplicitIntentMatchedInternalComponent(in Intent intent);
		void onUnsafeIntent(int type, in Intent intent);
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -249,6 +249,9 @@ public class ClientTransaction implements Parcelable, ObjectPoolItem {

		@Override
		public void recycle() {
		if (Flags.disableObjectPool()) {
		return;
		}
		if (mTransactionItems != null) {
		int size = mTransactionItems.size();
		for (int i = 0; i < size; i++) {

+8 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package android.app.servertransaction;

		import com.android.window.flags.Flags;

		import java.util.ArrayList;
		import java.util.HashMap;
		import java.util.Map;
		@@ -38,6 +40,9 @@ class ObjectPool {
		* @return An instance or null if there is none.
		*/
		public static <T extends ObjectPoolItem> T obtain(Class<T> itemClass) {
		if (Flags.disableObjectPool()) {
		return null;
		}
		synchronized (sPoolSync) {
		@SuppressWarnings("unchecked")
		final ArrayList<T> itemPool = (ArrayList<T>) sPoolMap.get(itemClass);
		@@ -54,6 +59,9 @@ class ObjectPool {
		* @see ObjectPoolItem#recycle()
		*/
		public static <T extends ObjectPoolItem> void recycle(T item) {
		if (Flags.disableObjectPool()) {
		return;
		}
		synchronized (sPoolSync) {
		@SuppressWarnings("unchecked")
		ArrayList<T> itemPool = (ArrayList<T>) sPoolMap.get(item.getClass());