Snap for 12309590 from 4fc106bbd97a6757445868086041274c56aef608 to 24Q4-release (f55d0937) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+0 −15

Original line number	Diff line number	Diff line
		@@ -100,7 +100,6 @@ aconfig_declarations_group {
		"framework-jobscheduler-job.flags-aconfig-java",
		"framework_graphics_flags_java_lib",
		"hwui_flags_java_lib",
		"interaction_jank_monitor_flags_lib",
		"libcore_exported_aconfig_flags_lib",
		"libgui_flags_java_lib",
		"power_flags_lib",
		@@ -1579,17 +1578,3 @@ java_aconfig_library {
		aconfig_declarations: "dropbox_flags",
		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"],
		}

core/api/system-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -61,6 +61,7 @@ package android {
		field @FlaggedApi("com.android.internal.telephony.flags.use_oem_domain_selection_service") public static final String BIND_DOMAIN_SELECTION_SERVICE = "android.permission.BIND_DOMAIN_SELECTION_SERVICE";
		field public static final String BIND_DOMAIN_VERIFICATION_AGENT = "android.permission.BIND_DOMAIN_VERIFICATION_AGENT";
		field public static final String BIND_EUICC_SERVICE = "android.permission.BIND_EUICC_SERVICE";
		field @FlaggedApi("android.crashrecovery.flags.enable_crashrecovery") public static final String BIND_EXPLICIT_HEALTH_CHECK_SERVICE = "android.permission.BIND_EXPLICIT_HEALTH_CHECK_SERVICE";
		field public static final String BIND_EXTERNAL_STORAGE_SERVICE = "android.permission.BIND_EXTERNAL_STORAGE_SERVICE";
		field public static final String BIND_FIELD_CLASSIFICATION_SERVICE = "android.permission.BIND_FIELD_CLASSIFICATION_SERVICE";
		field public static final String BIND_GBA_SERVICE = "android.permission.BIND_GBA_SERVICE";
		@@ -4631,6 +4632,7 @@ package android.content.rollback {
		method public int getCommittedSessionId();
		method @NonNull public java.util.List<android.content.rollback.PackageRollbackInfo> getPackages();
		method public int getRollbackId();
		method @FlaggedApi("android.crashrecovery.flags.enable_crashrecovery") public int getRollbackImpactLevel();
		method public boolean isStaged();
		method public void writeToParcel(android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.content.rollback.RollbackInfo> CREATOR;

core/api/test-current.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -1269,10 +1269,6 @@ package android.content.res {

		package android.content.rollback {

		public final class RollbackInfo implements android.os.Parcelable {
		method @FlaggedApi("android.content.pm.recoverability_detection") public int getRollbackImpactLevel();
		}

		public final class RollbackManager {
		method @RequiresPermission(android.Manifest.permission.TEST_MANAGE_ROLLBACKS) public void blockRollbackManager(long);
		method @RequiresPermission(android.Manifest.permission.TEST_MANAGE_ROLLBACKS) public void expireRollbackForPackage(@NonNull String);
		@@ -1801,11 +1797,15 @@ package android.hardware.input {

		public class InputSettings {
		method @FlaggedApi("com.android.hardware.input.keyboard_a11y_bounce_keys_flag") public static int getAccessibilityBounceKeysThreshold(@NonNull android.content.Context);
		method @FlaggedApi("com.android.hardware.input.keyboard_repeat_keys") public static int getAccessibilityRepeatKeysDelay(@NonNull android.content.Context);
		method @FlaggedApi("com.android.hardware.input.keyboard_repeat_keys") public static int getAccessibilityRepeatKeysTimeout(@NonNull android.content.Context);
		method @FlaggedApi("com.android.hardware.input.keyboard_a11y_slow_keys_flag") public static int getAccessibilitySlowKeysThreshold(@NonNull android.content.Context);
		method @FlaggedApi("com.android.hardware.input.keyboard_a11y_mouse_keys") public static boolean isAccessibilityMouseKeysEnabled(@NonNull android.content.Context);
		method @FlaggedApi("com.android.hardware.input.keyboard_a11y_sticky_keys_flag") public static boolean isAccessibilityStickyKeysEnabled(@NonNull android.content.Context);
		method @FlaggedApi("com.android.hardware.input.keyboard_a11y_bounce_keys_flag") @RequiresPermission(android.Manifest.permission.WRITE_SETTINGS) public static void setAccessibilityBounceKeysThreshold(@NonNull android.content.Context, int);
		method @FlaggedApi("com.android.hardware.input.keyboard_a11y_mouse_keys") @RequiresPermission(android.Manifest.permission.WRITE_SETTINGS) public static void setAccessibilityMouseKeysEnabled(@NonNull android.content.Context, boolean);
		method @FlaggedApi("com.android.hardware.input.keyboard_repeat_keys") @RequiresPermission(android.Manifest.permission.WRITE_SETTINGS) public static void setAccessibilityRepeatKeysDelay(@NonNull android.content.Context, int);
		method @FlaggedApi("com.android.hardware.input.keyboard_repeat_keys") @RequiresPermission(android.Manifest.permission.WRITE_SETTINGS) public static void setAccessibilityRepeatKeysTimeout(@NonNull android.content.Context, int);
		method @FlaggedApi("com.android.hardware.input.keyboard_a11y_slow_keys_flag") @RequiresPermission(android.Manifest.permission.WRITE_SETTINGS) public static void setAccessibilitySlowKeysThreshold(@NonNull android.content.Context, int);
		method @FlaggedApi("com.android.hardware.input.keyboard_a11y_sticky_keys_flag") @RequiresPermission(android.Manifest.permission.WRITE_SETTINGS) public static void setAccessibilityStickyKeysEnabled(@NonNull android.content.Context, boolean);
		method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public static void setMaximumObscuringOpacityForTouch(@NonNull android.content.Context, @FloatRange(from=0, to=1) float);

core/java/android/app/admin/flags/flags.aconfig

+0 −7

Original line number	Diff line number	Diff line
		@@ -245,13 +245,6 @@ flag {
		}
		}

		flag {
		name: "allow_screen_brightness_control_on_cope"
		namespace: "enterprise"
		description: "Allow COPE admin to control screen brightness and timeout."
		bug: "323894620"
		}

		flag {
		name: "always_persist_do"
		namespace: "enterprise"

core/java/android/app/appfunctions/AppFunctionManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ public final class AppFunctionManager {
		/**
		* Creates an instance.
		*
		* @param mService An interface to the backing service.
		* @param service An interface to the backing service.
		* @param context A {@link Context}.
		* @hide
		*/