Snap for 12048319 from 8a926c7327d6732db15ce338ed148242f53ff094 to 24Q4-release (7520d2a9) · Commits · e / os / android_frameworks_base

core/api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -20355,6 +20355,7 @@ package android.hardware.display {
		method public android.view.Surface getSurface();
		method public void release();
		method public void resize(int, int, int);
		method @FlaggedApi("android.companion.virtualdevice.flags.virtual_display_rotation_api") public void setRotation(int);
		method public void setSurface(android.view.Surface);
		}

core/api/system-current.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -3775,6 +3775,7 @@ package android.content {
		method @Nullable @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public android.content.Intent registerReceiverForAllUsers(@Nullable android.content.BroadcastReceiver, @NonNull android.content.IntentFilter, @Nullable String, @Nullable android.os.Handler, int);
		method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public abstract void sendBroadcastAsUser(@RequiresPermission android.content.Intent, android.os.UserHandle, @Nullable String, @Nullable android.os.Bundle);
		method public void sendBroadcastMultiplePermissions(@NonNull android.content.Intent, @NonNull String[], @Nullable android.app.BroadcastOptions);
		method @FlaggedApi("android.os.ordered_broadcast_multiple_permissions") public void sendOrderedBroadcastMultiplePermissions(@NonNull android.content.Intent, @NonNull String[], @Nullable String, @Nullable android.content.BroadcastReceiver, @Nullable android.os.Handler, int, @Nullable String, @Nullable android.os.Bundle, @Nullable android.os.Bundle);
		method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public void startActivityAsUser(@NonNull @RequiresPermission android.content.Intent, @NonNull android.os.UserHandle);
		method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public void startActivityAsUser(@NonNull @RequiresPermission android.content.Intent, @Nullable android.os.Bundle, @NonNull android.os.UserHandle);
		field public static final String AMBIENT_CONTEXT_SERVICE = "ambient_context";
		@@ -5161,10 +5162,12 @@ package android.hardware.display {
		}

		public final class VirtualDisplayConfig implements android.os.Parcelable {
		method @FlaggedApi("android.companion.virtualdevice.flags.virtual_display_insets") @Nullable public android.view.DisplayCutout getDisplayCutout();
		method @FlaggedApi("android.companion.virtual.flags.vdm_custom_home") public boolean isHomeSupported();
		}

		public static final class VirtualDisplayConfig.Builder {
		method @FlaggedApi("android.companion.virtualdevice.flags.virtual_display_insets") @NonNull public android.hardware.display.VirtualDisplayConfig.Builder setDisplayCutout(@Nullable android.view.DisplayCutout);
		method @FlaggedApi("android.companion.virtual.flags.vdm_custom_home") @NonNull public android.hardware.display.VirtualDisplayConfig.Builder setHomeSupported(boolean);
		}

core/java/android/app/ContextImpl.java

+25 −2

Original line number	Diff line number	Diff line
		@@ -1552,6 +1552,17 @@ class ContextImpl extends Context {
		public void sendOrderedBroadcastAsUser(Intent intent, UserHandle user,
		String receiverPermission, int appOp, Bundle options, BroadcastReceiver resultReceiver,
		Handler scheduler, int initialCode, String initialData, Bundle initialExtras) {
		String[] receiverPermissions = receiverPermission == null ? null
		: new String[] {receiverPermission};
		sendOrderedBroadcastAsUserMultiplePermissions(intent, user, receiverPermissions, appOp,
		options, resultReceiver, scheduler, initialCode, initialData, initialExtras);
		}

		@Override
		public void sendOrderedBroadcastAsUserMultiplePermissions(Intent intent, UserHandle user,
		String[] receiverPermissions, int appOp, Bundle options,
		BroadcastReceiver resultReceiver, Handler scheduler, int initialCode,
		String initialData, Bundle initialExtras) {
		IIntentReceiver rd = null;
		if (resultReceiver != null) {
		if (mPackageInfo != null) {
		@@ -1571,8 +1582,6 @@ class ContextImpl extends Context {
		}
		}
		String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());
		String[] receiverPermissions = receiverPermission == null ? null
		: new String[] {receiverPermission};
		try {
		intent.prepareToLeaveProcess(this);
		ActivityManager.getService().broadcastIntentWithFeature(
		@@ -1598,6 +1607,20 @@ class ContextImpl extends Context {
		initialExtras);
		}

		@Override
		public void sendOrderedBroadcastMultiplePermissions(Intent intent, String[] receiverPermissions,
		String receiverAppOp, BroadcastReceiver resultReceiver, Handler scheduler,
		int initialCode, String initialData, @Nullable Bundle initialExtras,
		@Nullable Bundle options) {
		int intAppOp = AppOpsManager.OP_NONE;
		if (!TextUtils.isEmpty(receiverAppOp)) {
		intAppOp = AppOpsManager.strOpToOp(receiverAppOp);
		}
		sendOrderedBroadcastAsUserMultiplePermissions(intent, getUser(), receiverPermissions,
		intAppOp, options, resultReceiver, scheduler, initialCode, initialData,
		initialExtras);
		}

		@Override
		public void sendOrderedBroadcast(Intent intent, int initialCode, String receiverPermission,
		String receiverAppOp, BroadcastReceiver resultReceiver, Handler scheduler,

core/java/android/app/ResourcesManager.java

+9 −6

Original line number	Diff line number	Diff line
		@@ -74,7 +74,7 @@ public class ResourcesManager {
		static final String TAG = "ResourcesManager";
		private static final boolean DEBUG = false;

		private static ResourcesManager sResourcesManager;
		private static volatile ResourcesManager sResourcesManager;

		/**
		* Internal lock object
		@@ -359,17 +359,20 @@ public class ResourcesManager {
		sResourcesManager = resourcesManager;
		return oldResourceManager;
		}

		}

		@UnsupportedAppUsage
		public static ResourcesManager getInstance() {
		var rm = sResourcesManager;
		if (rm == null) {
		synchronized (ResourcesManager.class) {
		if (sResourcesManager == null) {
		sResourcesManager = new ResourcesManager();
		rm = sResourcesManager;
		if (rm == null) {
		sResourcesManager = rm = new ResourcesManager();
		}
		}
		return sResourcesManager;
		}
		return rm;
		}

		/**

core/java/android/app/WallpaperManager.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -261,13 +261,6 @@ public class WallpaperManager {
		*/
		public static final String COMMAND_GOING_TO_SLEEP = "android.wallpaper.goingtosleep";

		/**
		* Command for {@link #sendWallpaperCommand}: reported when a physical display switch event
		* happens, e.g. fold and unfold.
		* @hide
		*/
		public static final String COMMAND_DISPLAY_SWITCH = "android.wallpaper.displayswitch";

		/**
		* Command for {@link #sendWallpaperCommand}: reported when the wallpaper that was already
		* set is re-applied by the user.