Merge "Keep the flag entries sorted." into main
diff --git a/core/java/android/os/flags.aconfig b/core/java/android/os/flags.aconfig
index 81987907..c7cc653 100644
--- a/core/java/android/os/flags.aconfig
+++ b/core/java/android/os/flags.aconfig
@@ -2,87 +2,7 @@
container: "system"
container: "system"
-flag {
- name: "android_os_build_vanilla_ice_cream"
- is_exported: true
- namespace: "build"
- description: "Feature flag for adding the VANILLA_ICE_CREAM constant."
- bug: "264658905"
-}
-
-flag {
- name: "state_of_health_public"
- is_exported: true
- namespace: "system_sw_battery"
- description: "Feature flag for making state_of_health a public api."
- bug: "288842045"
-}
-
-flag {
- name: "disallow_cellular_null_ciphers_restriction"
- namespace: "cellular_security"
- description: "Guards a new UserManager user restriction that admins can use to require cellular encryption on their managed devices."
- bug: "276752881"
-}
-
-flag {
- name: "remove_app_profiler_pss_collection"
- is_exported: true
- namespace: "backstage_power"
- description: "Replaces background PSS collection in AppProfiler with RSS"
- bug: "297542292"
-}
-
-flag {
- name: "allow_thermal_headroom_thresholds"
- is_exported: true
- namespace: "game"
- description: "Enable thermal headroom thresholds API"
- bug: "288119641"
-}
-
-# This flag guards the private space feature, its APIs, and some of the feature implementations. The flag android.multiuser.Flags.enable_private_space_features exclusively guards all the implementations.
-flag {
- name: "allow_private_profile"
- is_exported: true
- namespace: "profile_experiences"
- description: "Guards a new Private Profile type in UserManager - everything from its setup to config to deletion."
- bug: "299069460"
- is_exported: true
-}
-
-flag {
- name: "adpf_prefer_power_efficiency"
- is_exported: true
- namespace: "game"
- description: "Guards the ADPF power efficiency API"
- bug: "288117936"
-}
-
-flag {
- name: "security_state_service"
- is_exported: true
- namespace: "dynamic_spl"
- description: "Guards the Security State API."
- bug: "302189431"
-}
-
-flag {
- name: "ordered_broadcast_multiple_permissions"
- is_exported: true
- namespace: "bluetooth"
- description: "Guards the Context.sendOrderedBroadcastMultiplePermissions API"
- bug: "345802719"
-}
-
-flag {
- name: "battery_saver_supported_check_api"
- is_exported: true
- namespace: "backstage_power"
- description: "Guards a new API in PowerManager to check if battery saver is supported or not."
- bug: "305067031"
-}
-
+# keep-sorted start block=yes newline_separated=yes
flag {
name: "adpf_gpu_report_actual_work_duration"
is_exported: true
@@ -92,21 +12,6 @@
}
flag {
- name: "adpf_use_fmq_channel"
- namespace: "game"
- description: "Guards use of the FMQ channel for ADPF"
- bug: "315894228"
-}
-
-flag {
- name: "adpf_use_fmq_channel_fixed"
- namespace: "game"
- description: "Guards use of the FMQ channel for ADPF with a readonly flag"
- is_fixed_read_only: true
- bug: "315894228"
-}
-
-flag {
name: "adpf_hwui_gpu"
namespace: "game"
description: "Guards use of the FMQ channel for ADPF"
@@ -115,6 +20,13 @@
}
flag {
+ name: "adpf_measure_during_input_event_boost"
+ namespace: "game"
+ description: "Guards use of a boost when view measures during input events"
+ bug: "256549451"
+}
+
+flag {
name: "adpf_obtainview_boost"
namespace: "game"
description: "Guards use of a boost in response to HWUI obtainView"
@@ -131,41 +43,67 @@
}
flag {
- name: "adpf_measure_during_input_event_boost"
- namespace: "game"
- description: "Guards use of a boost when view measures during input events"
- bug: "256549451"
-}
-
-flag {
- name: "battery_service_support_current_adb_command"
- namespace: "backstage_power"
- description: "Whether or not BatteryService supports adb commands for Current values."
- is_fixed_read_only: true
- bug: "315037695"
-}
-
-flag {
- name: "strict_mode_restricted_network"
- namespace: "backstage_power"
- description: "Guards StrictMode APIs for detecting restricted network access."
- bug: "317250784"
-}
-
-flag {
- name: "binder_frozen_state_change_callback"
+ name: "adpf_prefer_power_efficiency"
is_exported: true
- namespace: "system_performance"
- description: "Guards the frozen state change callback API."
- bug: "361157077"
+ namespace: "game"
+ description: "Guards the ADPF power efficiency API"
+ bug: "288117936"
}
flag {
- name: "message_queue_tail_tracking"
- namespace: "system_performance"
- description: "track tail of message queue."
- bug: "305311707"
+ name: "adpf_use_fmq_channel"
+ namespace: "game"
+ description: "Guards use of the FMQ channel for ADPF"
+ bug: "315894228"
+}
+
+flag {
+ name: "adpf_use_fmq_channel_fixed"
+ namespace: "game"
+ description: "Guards use of the FMQ channel for ADPF with a readonly flag"
is_fixed_read_only: true
+ bug: "315894228"
+}
+
+flag {
+ name: "allow_consentless_bugreport_delegated_consent"
+ namespace: "crumpet"
+ description: "Allow privileged apps to call bugreport generation without enforcing user consent and delegate it to the calling app instead"
+ bug: "324046728"
+}
+
+# This flag guards the private space feature, its APIs, and some of the feature implementations. The flag android.multiuser.Flags.enable_private_space_features exclusively guards all the implementations.
+flag {
+ name: "allow_private_profile"
+ is_exported: true
+ namespace: "profile_experiences"
+ description: "Guards a new Private Profile type in UserManager - everything from its setup to config to deletion."
+ bug: "299069460"
+ is_exported: true
+}
+
+flag {
+ name: "allow_thermal_headroom_thresholds"
+ is_exported: true
+ namespace: "game"
+ description: "Enable thermal headroom thresholds API"
+ bug: "288119641"
+}
+
+flag {
+ name: "android_os_build_vanilla_ice_cream"
+ is_exported: true
+ namespace: "build"
+ description: "Feature flag for adding the VANILLA_ICE_CREAM constant."
+ bug: "264658905"
+}
+
+flag {
+ name: "api_for_backported_fixes"
+ namespace: "media_reliability"
+ description: "Public API app developers use to check if a known issue is fixed on a device."
+ bug: "308461809"
+ is_exported: true
}
flag {
@@ -178,35 +116,42 @@
}
flag {
- name: "storage_lifetime_api"
+ name: "battery_saver_supported_check_api"
is_exported: true
- namespace: "phoenix"
- description: "Feature flag for adding storage component health APIs."
+ namespace: "backstage_power"
+ description: "Guards a new API in PowerManager to check if battery saver is supported or not."
+ bug: "305067031"
+}
+
+flag {
+ name: "battery_service_support_current_adb_command"
+ namespace: "backstage_power"
+ description: "Whether or not BatteryService supports adb commands for Current values."
is_fixed_read_only: true
- bug: "309792384"
+ bug: "315037695"
}
flag {
- namespace: "system_performance"
- name: "telemetry_apis_framework_initialization"
- is_exported: true
- description: "Control framework initialization APIs of telemetry APIs feature."
- is_fixed_read_only: true
- bug: "324241334"
+ name: "binder_frozen_state_change_callback"
+ is_exported: true
+ namespace: "system_performance"
+ description: "Guards the frozen state change callback API."
+ bug: "361157077"
}
flag {
- namespace: "system_performance"
- name: "perfetto_sdk_tracing"
- description: "Tracing using Perfetto SDK."
- bug: "303199244"
+ name: "disallow_cellular_null_ciphers_restriction"
+ namespace: "cellular_security"
+ description: "Guards a new UserManager user restriction that admins can use to require cellular encryption on their managed devices."
+ bug: "276752881"
}
flag {
- name: "allow_consentless_bugreport_delegated_consent"
- namespace: "crumpet"
- description: "Allow privileged apps to call bugreport generation without enforcing user consent and delegate it to the calling app instead"
- bug: "324046728"
+ name: "enable_angle_allow_list"
+ namespace: "gpu"
+ description: "Whether to read from angle allowlist to determine if app should use ANGLE"
+ is_fixed_read_only: true
+ bug: "370845648"
}
flag {
@@ -226,6 +171,14 @@
}
flag {
+ name: "message_queue_tail_tracking"
+ namespace: "system_performance"
+ description: "track tail of message queue."
+ bug: "305311707"
+ is_fixed_read_only: true
+}
+
+flag {
name: "network_time_uses_shared_memory"
namespace: "system_performance"
description: "SystemClock.currentNetworkTimeMillis() reads network time offset from shared memory"
@@ -234,17 +187,67 @@
}
flag {
- name: "enable_angle_allow_list"
- namespace: "gpu"
- description: "Whether to read from angle allowlist to determine if app should use ANGLE"
- is_fixed_read_only: true
- bug: "370845648"
+ name: "ordered_broadcast_multiple_permissions"
+ is_exported: true
+ namespace: "bluetooth"
+ description: "Guards the Context.sendOrderedBroadcastMultiplePermissions API"
+ bug: "345802719"
}
flag {
- name: "api_for_backported_fixes"
- namespace: "media_reliability"
- description: "Public API app developers use to check if a known issue is fixed on a device."
- bug: "308461809"
+ name: "remove_app_profiler_pss_collection"
is_exported: true
+ namespace: "backstage_power"
+ description: "Replaces background PSS collection in AppProfiler with RSS"
+ bug: "297542292"
}
+
+flag {
+ name: "security_state_service"
+ is_exported: true
+ namespace: "dynamic_spl"
+ description: "Guards the Security State API."
+ bug: "302189431"
+}
+
+flag {
+ name: "state_of_health_public"
+ is_exported: true
+ namespace: "system_sw_battery"
+ description: "Feature flag for making state_of_health a public api."
+ bug: "288842045"
+}
+
+flag {
+ name: "storage_lifetime_api"
+ is_exported: true
+ namespace: "phoenix"
+ description: "Feature flag for adding storage component health APIs."
+ is_fixed_read_only: true
+ bug: "309792384"
+}
+
+flag {
+ name: "strict_mode_restricted_network"
+ namespace: "backstage_power"
+ description: "Guards StrictMode APIs for detecting restricted network access."
+ bug: "317250784"
+}
+
+flag {
+ namespace: "system_performance"
+ name: "perfetto_sdk_tracing"
+ description: "Tracing using Perfetto SDK."
+ bug: "303199244"
+}
+
+flag {
+ namespace: "system_performance"
+ name: "telemetry_apis_framework_initialization"
+ is_exported: true
+ description: "Control framework initialization APIs of telemetry APIs feature."
+ is_fixed_read_only: true
+ bug: "324241334"
+}
+
+# keep-sorted end