Snap for 12319997 from 4211f8432e1d04758b72201e6df3657d0621075d to 24Q4-release (67aeb02e) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+27 −0

Original line number	Original line	Diff line number	Diff line
	@@ -100,6 +100,7 @@ aconfig_declarations_group {
	"framework-jobscheduler-job.flags-aconfig-java",		"framework-jobscheduler-job.flags-aconfig-java",
	"framework_graphics_flags_java_lib",		"framework_graphics_flags_java_lib",
	"hwui_flags_java_lib",		"hwui_flags_java_lib",
			"interaction_jank_monitor_flags_lib",
	"libcore_exported_aconfig_flags_lib",		"libcore_exported_aconfig_flags_lib",
	"libgui_flags_java_lib",		"libgui_flags_java_lib",
	"power_flags_lib",		"power_flags_lib",
	@@ -1428,6 +1429,18 @@ java_aconfig_library {
	defaults: ["framework-minus-apex-aconfig-java-defaults"],		defaults: ["framework-minus-apex-aconfig-java-defaults"],
	}		}

			java_aconfig_library {
			name: "android.app.appfunctions.exported-flags-aconfig-java",
			aconfig_declarations: "android.app.appfunctions.flags-aconfig",
			defaults: ["framework-minus-apex-aconfig-java-defaults"],
			mode: "exported",
			apex_available: [
			"//apex_available:platform",
			"com.android.permission",
			],
			min_sdk_version: "30",
			}

	// Adaptive Auth		// Adaptive Auth
	aconfig_declarations {		aconfig_declarations {
	name: "android.adaptiveauth.flags-aconfig",		name: "android.adaptiveauth.flags-aconfig",
	@@ -1578,3 +1591,17 @@ java_aconfig_library {
	aconfig_declarations: "dropbox_flags",		aconfig_declarations: "dropbox_flags",
	defaults: ["framework-minus-apex-aconfig-java-defaults"],		defaults: ["framework-minus-apex-aconfig-java-defaults"],
	}		}

			// Zero Jank
			aconfig_declarations {
			name: "interaction_jank_monitor_flags",
			package: "com.android.internal.jank",
			container: "system",
			srcs: ["core/java/com/android/internal/jank/flags.aconfig"],
			}

			java_aconfig_library {
			name: "interaction_jank_monitor_flags_lib",
			aconfig_declarations: "interaction_jank_monitor_flags",
			defaults: ["framework-minus-apex-aconfig-java-defaults"],
			}

Ravenwood.bp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -50,7 +50,7 @@ genrule_defaults {
	framework_minus_apex_cmd = "$(location hoststubgen) " +		framework_minus_apex_cmd = "$(location hoststubgen) " +
	"@$(location :ravenwood-standard-options) " +		"@$(location :ravenwood-standard-options) " +
	"--debug-log $(location hoststubgen_framework-minus-apex.log) " +		"--debug-log $(location hoststubgen_framework-minus-apex.log) " +
	"--out-impl-jar $(location ravenwood.jar) " +		"--out-jar $(location ravenwood.jar) " +
	"--in-jar $(location :framework-minus-apex-for-hoststubgen) " +		"--in-jar $(location :framework-minus-apex-for-hoststubgen) " +
	"--policy-override-file $(location :ravenwood-framework-policies) " +		"--policy-override-file $(location :ravenwood-framework-policies) " +
	"--annotation-allowed-classes-file $(location :ravenwood-annotation-allowed-classes) "		"--annotation-allowed-classes-file $(location :ravenwood-annotation-allowed-classes) "
	@@ -183,7 +183,7 @@ java_genrule {
	"--stats-file $(location hoststubgen_services.core_stats.csv) " +		"--stats-file $(location hoststubgen_services.core_stats.csv) " +
	"--supported-api-list-file $(location hoststubgen_services.core_apis.csv) " +		"--supported-api-list-file $(location hoststubgen_services.core_apis.csv) " +

	"--out-impl-jar $(location ravenwood.jar) " +		"--out-jar $(location ravenwood.jar) " +

	"--gen-keep-all-file $(location hoststubgen_services.core_keep_all.txt) " +		"--gen-keep-all-file $(location hoststubgen_services.core_keep_all.txt) " +
	"--gen-input-dump-file $(location hoststubgen_services.core_dump.txt) " +		"--gen-input-dump-file $(location hoststubgen_services.core_dump.txt) " +

core/api/current.txt

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -43963,11 +43963,11 @@ package android.telephony {
	field @FlaggedApi("com.android.internal.telephony.flags.carrier_enabled_satellite_flag") public static final String KEY_SATELLITE_CONNECTION_HYSTERESIS_SEC_INT = "satellite_connection_hysteresis_sec_int";		field @FlaggedApi("com.android.internal.telephony.flags.carrier_enabled_satellite_flag") public static final String KEY_SATELLITE_CONNECTION_HYSTERESIS_SEC_INT = "satellite_connection_hysteresis_sec_int";
	field @FlaggedApi("com.android.internal.telephony.flags.carrier_enabled_satellite_flag") public static final String KEY_SATELLITE_ENTITLEMENT_STATUS_REFRESH_DAYS_INT = "satellite_entitlement_status_refresh_days_int";		field @FlaggedApi("com.android.internal.telephony.flags.carrier_enabled_satellite_flag") public static final String KEY_SATELLITE_ENTITLEMENT_STATUS_REFRESH_DAYS_INT = "satellite_entitlement_status_refresh_days_int";
	field @FlaggedApi("com.android.internal.telephony.flags.carrier_enabled_satellite_flag") public static final String KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL = "satellite_entitlement_supported_bool";		field @FlaggedApi("com.android.internal.telephony.flags.carrier_enabled_satellite_flag") public static final String KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL = "satellite_entitlement_supported_bool";
	field @FlaggedApi("com.android.internal.telephony.flags.carrier_roaming_nb_iot_ntn") public static final String KEY_SATELLITE_ESOS_INACTIVITY_TIMEOUT_SEC_INT = "satellite_esos_inactivity_timeout_sec_int";
	field @FlaggedApi("com.android.internal.telephony.flags.carrier_roaming_nb_iot_ntn") public static final String KEY_SATELLITE_ESOS_SUPPORTED_BOOL = "satellite_esos_supported_bool";		field @FlaggedApi("com.android.internal.telephony.flags.carrier_roaming_nb_iot_ntn") public static final String KEY_SATELLITE_ESOS_SUPPORTED_BOOL = "satellite_esos_supported_bool";
	field @FlaggedApi("com.android.internal.telephony.flags.carrier_roaming_nb_iot_ntn") public static final String KEY_SATELLITE_P2P_SMS_INACTIVITY_TIMEOUT_SEC_INT = "satellite_p2p_sms_inactivity_timeout_sec_int";		field @FlaggedApi("com.android.internal.telephony.flags.carrier_roaming_nb_iot_ntn") public static final String KEY_SATELLITE_ROAMING_ESOS_INACTIVITY_TIMEOUT_SEC_INT = "satellite_roaming_esos_inactivity_timeout_sec_int";
			field @FlaggedApi("com.android.internal.telephony.flags.carrier_roaming_nb_iot_ntn") public static final String KEY_SATELLITE_ROAMING_P2P_SMS_INACTIVITY_TIMEOUT_SEC_INT = "satellite_roaming_p2p_sms_inactivity_timeout_sec_int";
	field @FlaggedApi("com.android.internal.telephony.flags.carrier_roaming_nb_iot_ntn") public static final String KEY_SATELLITE_ROAMING_P2P_SMS_SUPPORTED_BOOL = "satellite_roaming_p2p_sms_supported_bool";		field @FlaggedApi("com.android.internal.telephony.flags.carrier_roaming_nb_iot_ntn") public static final String KEY_SATELLITE_ROAMING_P2P_SMS_SUPPORTED_BOOL = "satellite_roaming_p2p_sms_supported_bool";
	field @FlaggedApi("com.android.internal.telephony.flags.carrier_roaming_nb_iot_ntn") public static final String KEY_SATELLITE_SCREEN_OFF_INACTIVITY_TIMEOUT_SEC_INT = "satellite_screen_off_inactivity_timeout_sec_int";		field @FlaggedApi("com.android.internal.telephony.flags.carrier_roaming_nb_iot_ntn") public static final String KEY_SATELLITE_ROAMING_SCREEN_OFF_INACTIVITY_TIMEOUT_SEC_INT = "satellite_roaming_screen_off_inactivity_timeout_sec_int";
	field public static final String KEY_SHOW_4G_FOR_3G_DATA_ICON_BOOL = "show_4g_for_3g_data_icon_bool";		field public static final String KEY_SHOW_4G_FOR_3G_DATA_ICON_BOOL = "show_4g_for_3g_data_icon_bool";
	field public static final String KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL = "show_4g_for_lte_data_icon_bool";		field public static final String KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL = "show_4g_for_lte_data_icon_bool";
	field public static final String KEY_SHOW_APN_SETTING_CDMA_BOOL = "show_apn_setting_cdma_bool";		field public static final String KEY_SHOW_APN_SETTING_CDMA_BOOL = "show_apn_setting_cdma_bool";

core/java/android/app/NotificationChannel.java

+53 −6

Original line number	Original line	Diff line number	Diff line
	@@ -168,7 +168,11 @@ public final class NotificationChannel implements Parcelable {
	/**		/**
	* @hide		* @hide
	*/		*/
	public static final int MAX_VIBRATION_LENGTH = 1000;		public static final int MAX_VIBRATION_LENGTH = 500;
			/**
			* @hide
			*/
			public static final int MAX_SERIALIZED_VIBRATION_LENGTH = 32_768;

	private static final String TAG_CHANNEL = "channel";		private static final String TAG_CHANNEL = "channel";
	private static final String ATT_NAME = "name";		private static final String ATT_NAME = "name";
	@@ -368,6 +372,9 @@ public final class NotificationChannel implements Parcelable {
	if (Flags.notificationChannelVibrationEffectApi()) {		if (Flags.notificationChannelVibrationEffectApi()) {
	mVibrationEffect =		mVibrationEffect =
	in.readInt() != 0 ? VibrationEffect.CREATOR.createFromParcel(in) : null;		in.readInt() != 0 ? VibrationEffect.CREATOR.createFromParcel(in) : null;
			if (Flags.notifChannelCropVibrationEffects() && mVibrationEffect != null) {
			mVibrationEffect = getTrimmedVibrationEffect(mVibrationEffect);
			}
	}		}
	mUserLockedFields = in.readInt();		mUserLockedFields = in.readInt();
	mUserVisibleTaskShown = in.readByte() != 0;		mUserVisibleTaskShown = in.readByte() != 0;
	@@ -582,6 +589,23 @@ public final class NotificationChannel implements Parcelable {
	return input;		return input;
	}		}

			// Returns trimmed vibration effect or null if not trimmable.
			private VibrationEffect getTrimmedVibrationEffect(VibrationEffect effect) {
			if (effect == null) {
			return null;
			}
			// trim if possible; check serialized length; reject if it is still too long
			VibrationEffect result = effect;
			VibrationEffect trimmed = effect.cropToLengthOrNull(MAX_VIBRATION_LENGTH);
			if (trimmed != null) {
			result = trimmed;
			}
			if (vibrationToString(result).length() > MAX_SERIALIZED_VIBRATION_LENGTH) {
			return null;
			}
			return result;
			}

	/**		/**
	* @hide		* @hide
	*/		*/
	@@ -685,6 +709,11 @@ public final class NotificationChannel implements Parcelable {
	public void setVibrationPattern(long[] vibrationPattern) {		public void setVibrationPattern(long[] vibrationPattern) {
	this.mVibrationEnabled = vibrationPattern != null && vibrationPattern.length > 0;		this.mVibrationEnabled = vibrationPattern != null && vibrationPattern.length > 0;
	this.mVibrationPattern = vibrationPattern;		this.mVibrationPattern = vibrationPattern;
			if (Flags.notifChannelCropVibrationEffects()) {
			if (vibrationPattern != null && vibrationPattern.length > MAX_VIBRATION_LENGTH) {
			this.mVibrationPattern = Arrays.copyOf(vibrationPattern, MAX_VIBRATION_LENGTH);
			}
			}
	if (Flags.notificationChannelVibrationEffectApi()) {		if (Flags.notificationChannelVibrationEffectApi()) {
	try {		try {
	this.mVibrationEffect =		this.mVibrationEffect =
	@@ -731,9 +760,21 @@ public final class NotificationChannel implements Parcelable {
	public void setVibrationEffect(@Nullable VibrationEffect effect) {		public void setVibrationEffect(@Nullable VibrationEffect effect) {
	this.mVibrationEnabled = effect != null;		this.mVibrationEnabled = effect != null;
	this.mVibrationEffect = effect;		this.mVibrationEffect = effect;
			if (Flags.notifChannelCropVibrationEffects() && effect != null) {
			// Try converting to a vibration pattern and trimming that array. If not convertible
			// to a pattern directly, try trimming the vibration effect if possible and storing
			// that version instead.
			long[] pattern = effect.computeCreateWaveformOffOnTimingsOrNull();
			if (pattern != null) {
			setVibrationPattern(pattern);
			} else {
			this.mVibrationEffect = getTrimmedVibrationEffect(mVibrationEffect);
			}
			} else {
	this.mVibrationPattern =		this.mVibrationPattern =
	effect == null		mVibrationEffect == null
	? null : effect.computeCreateWaveformOffOnTimingsOrNull();		? null : mVibrationEffect.computeCreateWaveformOffOnTimingsOrNull();
			}
	}		}

	/**		/**
	@@ -1172,7 +1213,9 @@ public final class NotificationChannel implements Parcelable {
	if (vibrationEffect != null) {		if (vibrationEffect != null) {
	// Restore the effect only if it is not null. This allows to avoid undoing a		// Restore the effect only if it is not null. This allows to avoid undoing a
	// `setVibrationPattern` call above, if that was done with a non-null pattern		// `setVibrationPattern` call above, if that was done with a non-null pattern
	// (e.g. back up from a version that did not support `setVibrationEffect`).		// (e.g. back up from a version that did not support `setVibrationEffect`), or
			// when notif_channel_crop_vibration_effects is true, if there is an equivalent
			// vibration pattern available.
	setVibrationEffect(vibrationEffect);		setVibrationEffect(vibrationEffect);
	}		}
	}		}
	@@ -1365,8 +1408,12 @@ public final class NotificationChannel implements Parcelable {
	out.attribute(null, ATT_VIBRATION, longArrayToString(getVibrationPattern()));		out.attribute(null, ATT_VIBRATION, longArrayToString(getVibrationPattern()));
	}		}
	if (getVibrationEffect() != null) {		if (getVibrationEffect() != null) {
			if (!Flags.notifChannelCropVibrationEffects() \|\| getVibrationPattern() == null) {
			// When notif_channel_crop_vibration_effects is on, only serialize the vibration
			// effect if we do not already have an equivalent vibration pattern.
	out.attribute(null, ATT_VIBRATION_EFFECT, vibrationToString(getVibrationEffect()));		out.attribute(null, ATT_VIBRATION_EFFECT, vibrationToString(getVibrationEffect()));
	}		}
			}
	if (getUserLockedFields() != 0) {		if (getUserLockedFields() != 0) {
	out.attributeInt(null, ATT_USER_LOCKED, getUserLockedFields());		out.attributeInt(null, ATT_USER_LOCKED, getUserLockedFields());
	}		}

core/java/android/app/admin/DevicePolicyManager.java

+4 −21

Original line number	Original line	Diff line number	Diff line
	@@ -10476,10 +10476,6 @@ public class DevicePolicyManager {
	@WorkerThread		@WorkerThread
	public void setApplicationRestrictions(@Nullable ComponentName admin, String packageName,		public void setApplicationRestrictions(@Nullable ComponentName admin, String packageName,
	Bundle settings) {		Bundle settings) {
	if (!Flags.dmrhSetAppRestrictions()) {
	throwIfParentInstance("setApplicationRestrictions");
	}

	if (mService != null) {		if (mService != null) {
	try {		try {
	mService.setApplicationRestrictions(admin, mContext.getPackageName(), packageName,		mService.setApplicationRestrictions(admin, mContext.getPackageName(), packageName,
	@@ -11884,9 +11880,6 @@ public class DevicePolicyManager {
	@WorkerThread		@WorkerThread
	public @NonNull Bundle getApplicationRestrictions(		public @NonNull Bundle getApplicationRestrictions(
	@Nullable ComponentName admin, String packageName) {		@Nullable ComponentName admin, String packageName) {
	if (!Flags.dmrhSetAppRestrictions()) {
	throwIfParentInstance("getApplicationRestrictions");
	}

	if (mService != null) {		if (mService != null) {
	try {		try {
	@@ -14231,21 +14224,11 @@ public class DevicePolicyManager {
	*/		*/
	public @NonNull DevicePolicyManager getParentProfileInstance(@NonNull ComponentName admin) {		public @NonNull DevicePolicyManager getParentProfileInstance(@NonNull ComponentName admin) {
	throwIfParentInstance("getParentProfileInstance");		throwIfParentInstance("getParentProfileInstance");
	try {
	if (Flags.dmrhSetAppRestrictions()) {
	UserManager um = mContext.getSystemService(UserManager.class);		UserManager um = mContext.getSystemService(UserManager.class);
	if (!um.isManagedProfile()) {		if (!um.isManagedProfile()) {
	throw new SecurityException("The current user does not have a parent profile.");		throw new SecurityException("The current user does not have a parent profile.");
	}		}
	} else {
	if (!mService.isManagedProfile(admin)) {
	throw new SecurityException("The current user does not have a parent profile.");
	}
	}
	return new DevicePolicyManager(mContext, mService, true);		return new DevicePolicyManager(mContext, mService, true);
	} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();
	}
	}		}

	/**		/**