Snap for 12313714 from db45b25e979a520661aa0f349b14a04c04b5fa66 to 24Q4-release (8333b552) · Commits · e / os / android_frameworks_base

core/api/current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -7964,13 +7964,13 @@ package android.app.admin {
		field public static final String LOCK_TASK_POLICY = "lockTask";
		field public static final String PACKAGES_SUSPENDED_POLICY = "packagesSuspended";
		field public static final String PACKAGE_UNINSTALL_BLOCKED_POLICY = "packageUninstallBlocked";
		field @FlaggedApi("android.app.admin.flags.policy_engine_migration_v2_enabled") public static final String PASSWORD_COMPLEXITY_POLICY = "passwordComplexity";
		field public static final String PASSWORD_COMPLEXITY_POLICY = "passwordComplexity";
		field public static final String PERMISSION_GRANT_POLICY = "permissionGrant";
		field public static final String PERSISTENT_PREFERRED_ACTIVITY_POLICY = "persistentPreferredActivity";
		field public static final String RESET_PASSWORD_TOKEN_POLICY = "resetPasswordToken";
		field public static final String SECURITY_LOGGING_POLICY = "securityLogging";
		field public static final String STATUS_BAR_DISABLED_POLICY = "statusBarDisabled";
		field @FlaggedApi("android.app.admin.flags.policy_engine_migration_v2_enabled") public static final String USB_DATA_SIGNALING_POLICY = "usbDataSignaling";
		field public static final String USB_DATA_SIGNALING_POLICY = "usbDataSignaling";
		field public static final String USER_CONTROL_DISABLED_PACKAGES_POLICY = "userControlDisabledPackages";
		}

core/api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -3470,6 +3470,7 @@ package android.companion.virtual {
		public static interface VirtualDeviceManager.ActivityListener {
		method @FlaggedApi("android.companion.virtualdevice.flags.activity_control_api") public default void onActivityLaunchBlocked(int, @NonNull android.content.ComponentName, @NonNull android.os.UserHandle, @Nullable android.content.IntentSender);
		method public void onDisplayEmpty(int);
		method @FlaggedApi("android.companion.virtualdevice.flags.activity_control_api") public default void onSecureWindowShown(int, @NonNull android.content.ComponentName, @NonNull android.os.UserHandle);
		method @Deprecated public void onTopActivityChanged(int, @NonNull android.content.ComponentName);
		method public default void onTopActivityChanged(int, @NonNull android.content.ComponentName, int);
		}

core/api/test-current.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -597,19 +597,19 @@ package android.app.admin {
		method @RequiresPermission(android.Manifest.permission.FORCE_DEVICE_POLICY_MANAGER_LOGS) public long forceNetworkLogs();
		method @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public void forceRemoveActiveAdmin(@NonNull android.content.ComponentName, int);
		method @RequiresPermission(android.Manifest.permission.FORCE_DEVICE_POLICY_MANAGER_LOGS) public long forceSecurityLogs();
		method @FlaggedApi("android.app.admin.flags.device_policy_size_tracking_internal_bug_fix_enabled") @RequiresPermission("android.permission.MANAGE_DEVICE_POLICY_STORAGE_LIMIT") public void forceSetMaxPolicyStorageLimit(int);
		method @RequiresPermission("android.permission.MANAGE_DEVICE_POLICY_STORAGE_LIMIT") public void forceSetMaxPolicyStorageLimit(int);
		method public void forceUpdateUserSetupComplete(int);
		method @NonNull public java.util.Set<java.lang.String> getDefaultCrossProfilePackages();
		method @Deprecated public int getDeviceOwnerType(@NonNull android.content.ComponentName);
		method @Nullable public String getDevicePolicyManagementRoleHolderUpdaterPackage();
		method @NonNull public java.util.Set<java.lang.String> getDisallowedSystemApps(@NonNull android.content.ComponentName, int, @NonNull String);
		method @FlaggedApi("android.app.admin.flags.headless_device_owner_provisioning_fix_enabled") @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public int getHeadlessDeviceOwnerMode();
		method @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public int getHeadlessDeviceOwnerMode();
		method public long getLastBugReportRequestTime();
		method public long getLastNetworkLogRetrievalTime();
		method public long getLastSecurityLogRetrievalTime();
		method public java.util.List<java.lang.String> getOwnerInstalledCaCerts(@NonNull android.os.UserHandle);
		method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_ADMINS) public java.util.Set<java.lang.String> getPolicyExemptApps();
		method @FlaggedApi("android.app.admin.flags.device_policy_size_tracking_internal_bug_fix_enabled") @RequiresPermission("android.permission.MANAGE_DEVICE_POLICY_STORAGE_LIMIT") public int getPolicySizeForAdmin(@NonNull android.app.admin.EnforcingAdmin);
		method @RequiresPermission("android.permission.MANAGE_DEVICE_POLICY_STORAGE_LIMIT") public int getPolicySizeForAdmin(@NonNull android.app.admin.EnforcingAdmin);
		method public boolean isCurrentInputMethodSetByOwner();
		method public boolean isFactoryResetProtectionPolicySupported();
		method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}) public boolean isNewUserDisclaimerAcknowledged();
		@@ -680,7 +680,7 @@ package android.app.admin {
		}

		public final class EnforcingAdmin implements android.os.Parcelable {
		ctor @FlaggedApi("android.app.admin.flags.device_policy_size_tracking_internal_bug_fix_enabled") public EnforcingAdmin(@NonNull String, @NonNull android.app.admin.Authority, @NonNull android.os.UserHandle, @Nullable android.content.ComponentName);
		ctor public EnforcingAdmin(@NonNull String, @NonNull android.app.admin.Authority, @NonNull android.os.UserHandle, @Nullable android.content.ComponentName);
		}

		public final class FlagUnion extends android.app.admin.ResolutionMechanism<java.lang.Integer> {

core/java/android/app/AutomaticZenRule.java

+16 −3

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ public final class AutomaticZenRule implements Parcelable {

		/**
		* Rule is of an unknown type. This is the default value if not provided by the owning app,
		* and the value returned if the true type was added in an API level lower than the calling
		* and the value returned if the true type was added in an API level higher than the calling
		* app's targetSdk.
		*/
		@FlaggedApi(Flags.FLAG_MODES_API)
		@@ -315,7 +315,8 @@ public final class AutomaticZenRule implements Parcelable {
		}

		/**
		* Gets the zen policy.
		* Gets the {@link ZenPolicy} applied if {@link #getInterruptionFilter()} is
		* {@link NotificationManager#INTERRUPTION_FILTER_PRIORITY}.
		*/
		@Nullable
		public ZenPolicy getZenPolicy() {
		@@ -345,6 +346,17 @@ public final class AutomaticZenRule implements Parcelable {

		/**
		* Sets the interruption filter that is applied when this rule is active.
		*
		* <ul>
		* <li>When {@link NotificationManager#INTERRUPTION_FILTER_PRIORITY}, the rule will use
		* the {@link ZenPolicy} supplied to {@link #setZenPolicy} (or a default one).
		* <li>When {@link NotificationManager#INTERRUPTION_FILTER_ALARMS} or
		* {@link NotificationManager#INTERRUPTION_FILTER_NONE}, the rule will use a fixed
		* {@link ZenPolicy} matching the filter.
		* <li>When {@link NotificationManager#INTERRUPTION_FILTER_ALL}, the rule will not block
		* notifications, but can still have {@link ZenDeviceEffects}.
		* </ul>
		*
		* @param interruptionFilter The do not disturb mode to enter when this rule is active.
		*/
		public void setInterruptionFilter(@InterruptionFilter int interruptionFilter) {
		@@ -374,7 +386,8 @@ public final class AutomaticZenRule implements Parcelable {
		}

		/**
		* Sets the zen policy.
		* Sets the {@link ZenPolicy} applied if {@link #getInterruptionFilter()} is
		* {@link NotificationManager#INTERRUPTION_FILTER_PRIORITY}.
		*
		* <p>When updating an existing rule via {@link NotificationManager#updateAutomaticZenRule},
		* a {@code null} value here means the previous policy is retained.

core/java/android/app/Notification.java

+19 −34

Original line number	Diff line number	Diff line
		@@ -2706,16 +2706,11 @@ public class Notification implements Parcelable
		if (mAllowlistToken == null) {
		mAllowlistToken = processAllowlistToken;
		}
		if (Flags.secureAllowlistToken()) {
		// Propagate this token to all pending intents that are unmarshalled from the parcel,
		// or keep the one we're already propagating, if that's the case.
		if (!parcel.hasClassCookie(PendingIntent.class)) {
		parcel.setClassCookie(PendingIntent.class, mAllowlistToken);
		}
		} else {
		// Propagate this token to all pending intents that are unmarshalled from the parcel.
		parcel.setClassCookie(PendingIntent.class, mAllowlistToken);
		}

		when = parcel.readLong();
		creationTime = parcel.readLong();
		@@ -3333,7 +3328,6 @@ public class Notification implements Parcelable
		PendingIntent.addOnMarshaledListener(addedListener);
		}
		try {
		if (Flags.secureAllowlistToken()) {
		boolean mustClearCookie = false;
		if (!parcel.hasClassCookie(Notification.class)) {
		// This is the "root" notification, and not an "inner" notification (including
		@@ -3351,11 +3345,6 @@ public class Notification implements Parcelable
		parcel.removeClassCookie(Notification.class, mAllowlistToken);
		}
		}
		} else {
		// IMPORTANT: Add marshaling code in writeToParcelImpl as we
		// want to intercept all pending events written to the parcel.
		writeToParcelImpl(parcel, flags);
		}

		synchronized (this) {
		// Must be written last!
		@@ -3371,13 +3360,9 @@ public class Notification implements Parcelable
		private void writeToParcelImpl(Parcel parcel, int flags) {
		parcel.writeInt(1);

		if (Flags.secureAllowlistToken()) {
		// Always use the same token as the root notification (might be null).
		IBinder rootNotificationToken = (IBinder) parcel.getClassCookie(Notification.class);
		parcel.writeStrongBinder(rootNotificationToken);
		} else {
		parcel.writeStrongBinder(mAllowlistToken);
		}

		parcel.writeLong(when);
		parcel.writeLong(creationTime);