Snap for 14079904 from fd64ee96bb3dce3d80e7b50003e5e3f30cdd05ce to 25Q4-release (ee9670b4) · Commits · e / os / android_frameworks_base

boot/boot-image-profile-extra.txt

+7 −0

Original line number	Diff line number	Diff line
		@@ -87,3 +87,10 @@ HSPLandroid/os/Message;->compareMessages(Landroid/os/Message;Landroid/os/Message
		# and is captured with the boot image profiling pipeline.
		HSPLcom/android/internal/pm/SystemFeaturesMetadata;->*
		Lcom/android/internal/pm/SystemFeaturesMetadata;

		# These methods were previously direct `native` JNI calls, but were made into
		# Java wrappers with a recent change. Ensure they're compiled to avoid
		# regressions on any hot paths.
		# TOOD(b/417492941): Remove after inclusion in generated boot-image-profile.txt.
		HSPLandroid/os/Process;->setThreadPriority(II)V
		HSPLandroid/os/Process;->setThreadPriority(I)V

core/api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -253,6 +253,7 @@ package android {
		field public static final String PROVIDE_REMOTE_CREDENTIALS = "android.permission.PROVIDE_REMOTE_CREDENTIALS";
		field @FlaggedApi("android.security.aapm_api") public static final String QUERY_ADVANCED_PROTECTION_MODE = "android.permission.QUERY_ADVANCED_PROTECTION_MODE";
		field public static final String QUERY_ALL_PACKAGES = "android.permission.QUERY_ALL_PACKAGES";
		field @FlaggedApi("android.media.audio.guard_stream_volume_apis") public static final String QUERY_AUDIO_VOLUME = "android.permission.QUERY_AUDIO_VOLUME";
		field @FlaggedApi("android.permission.flags.ranging_permission_enabled") public static final String RANGING = "android.permission.RANGING";
		field public static final String READ_ASSISTANT_APP_SEARCH_DATA = "android.permission.READ_ASSISTANT_APP_SEARCH_DATA";
		field public static final String READ_BASIC_PHONE_STATE = "android.permission.READ_BASIC_PHONE_STATE";
		@@ -37194,6 +37195,7 @@ package android.provider {
		field public static final String PHONE_ACCOUNT_COMPONENT_NAME = "subscription_component_name";
		field public static final String PHONE_ACCOUNT_ID = "subscription_id";
		field public static final String POST_DIAL_DIGITS = "post_dial_digits";
		field @FlaggedApi("com.android.server.telecom.flags.support_display_name_call_log") public static final String PREFERRED_DISPLAY_NAME = "preferred_display_name";
		field public static final int PRESENTATION_ALLOWED = 1; // 0x1
		field public static final int PRESENTATION_PAYPHONE = 4; // 0x4
		field public static final int PRESENTATION_RESTRICTED = 2; // 0x2

core/api/system-current.txt

+25 −5

Original line number	Diff line number	Diff line
		@@ -1410,6 +1410,7 @@ package android.app.admin {
		method @RequiresPermission("android.permission.NOTIFY_PENDING_SYSTEM_UPDATE") public void notifyPendingSystemUpdate(long, boolean);
		method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public boolean packageHasActiveAdmins(String);
		method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS, android.Manifest.permission.PROVISION_DEMO_DEVICE}) public void provisionFullyManagedDevice(@NonNull android.app.admin.FullyManagedDeviceProvisioningParams) throws android.app.admin.ProvisioningException;
		method @FlaggedApi("android.app.admin.flags.multi_user_management_device_provisioning") @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public void provisionMultiUserDevice(@NonNull android.app.admin.MultiUserDeviceProvisioningParams) throws android.app.admin.ProvisioningException;
		method @FlaggedApi("android.app.admin.flags.remove_managed_profile_enabled") @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public boolean removeManagedProfile();
		method @RequiresPermission(android.Manifest.permission.TRIGGER_LOST_MODE) public void sendLostModeLocationUpdate(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Boolean>);
		method @Deprecated @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_ADMINS) public boolean setActiveProfileOwner(@NonNull android.content.ComponentName, String) throws java.lang.IllegalArgumentException;
		@@ -1432,6 +1433,7 @@ package android.app.admin {
		field public static final String ACTION_PROVISION_FINALIZATION = "android.app.action.PROVISION_FINALIZATION";
		field public static final String ACTION_PROVISION_FINANCED_DEVICE = "android.app.action.PROVISION_FINANCED_DEVICE";
		field public static final String ACTION_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE = "android.app.action.PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE";
		field @FlaggedApi("android.app.admin.flags.multi_user_management_device_provisioning") public static final String ACTION_PROVISION_MULTI_USER_DEVICE = "android.app.admin.action.PROVISION_MULTI_USER_DEVICE";
		field @RequiresPermission(android.Manifest.permission.MANAGE_FACTORY_RESET_PROTECTION) public static final String ACTION_RESET_PROTECTION_POLICY_CHANGED = "android.app.action.RESET_PROTECTION_POLICY_CHANGED";
		field @RequiresPermission(android.Manifest.permission.LAUNCH_DEVICE_MANAGER_SETUP) public static final String ACTION_ROLE_HOLDER_PROVISION_FINALIZATION = "android.app.action.ROLE_HOLDER_PROVISION_FINALIZATION";
		field @RequiresPermission(android.Manifest.permission.LAUNCH_DEVICE_MANAGER_SETUP) public static final String ACTION_ROLE_HOLDER_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE = "android.app.action.ROLE_HOLDER_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE";
		@@ -1497,6 +1499,7 @@ package android.app.admin {
		field public static final int STATUS_HAS_PAIRED = 8; // 0x8
		field public static final int STATUS_HEADLESS_ONLY_SYSTEM_USER = 17; // 0x11
		field public static final int STATUS_HEADLESS_SYSTEM_USER_MODE_NOT_SUPPORTED = 16; // 0x10
		field @FlaggedApi("android.app.admin.flags.multi_user_management_device_provisioning") public static final int STATUS_HEADLESS_SYSTEM_USER_MODE_REQUIRED = 19; // 0x13
		field public static final int STATUS_MANAGED_USERS_NOT_SUPPORTED = 9; // 0x9
		field public static final int STATUS_NONSYSTEM_USER_EXISTS = 5; // 0x5
		field public static final int STATUS_NOT_SYSTEM_USER = 7; // 0x7
		@@ -1632,6 +1635,23 @@ package android.app.admin {
		method @NonNull public android.app.admin.ManagedProfileProvisioningParams.Builder setProfileName(@Nullable String);
		}

		@FlaggedApi("android.app.admin.flags.multi_user_management_device_provisioning") public final class MultiUserDeviceProvisioningParams {
		method @NonNull public android.content.ComponentName getDeviceAdminComponentName();
		method public long getLocalTime();
		method @Nullable public java.util.Locale getLocale();
		method @Nullable public String getTimeZone();
		method public boolean isLeaveAllSystemAppsEnabled();
		}

		@FlaggedApi("android.app.admin.flags.multi_user_management_device_provisioning") public static final class MultiUserDeviceProvisioningParams.Builder {
		ctor public MultiUserDeviceProvisioningParams.Builder(@NonNull android.content.ComponentName);
		method @NonNull public android.app.admin.MultiUserDeviceProvisioningParams build();
		method @NonNull public android.app.admin.MultiUserDeviceProvisioningParams.Builder setLeaveAllSystemAppsEnabled(boolean);
		method @NonNull public android.app.admin.MultiUserDeviceProvisioningParams.Builder setLocalTime(long);
		method @NonNull public android.app.admin.MultiUserDeviceProvisioningParams.Builder setLocale(@Nullable java.util.Locale);
		method @NonNull public android.app.admin.MultiUserDeviceProvisioningParams.Builder setTimeZone(@Nullable String);
		}

		public final class NoArgsPolicyKey extends android.app.admin.PolicyKey {
		method public int describeContents();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		@@ -12369,13 +12389,13 @@ package android.os.vibrator {

		package android.os.vibrator.persistence {

		@FlaggedApi("android.os.vibrator.vibration_xml_apis") public final class ParsedVibration {
		method @FlaggedApi("android.os.vibrator.vibration_xml_apis") @Nullable public android.os.VibrationEffect resolve(@NonNull android.os.Vibrator);
		public final class ParsedVibration {
		method @Nullable public android.os.VibrationEffect resolve(@NonNull android.os.Vibrator);
		}

		@FlaggedApi("android.os.vibrator.vibration_xml_apis") public final class VibrationXmlParser {
		method @FlaggedApi("android.os.vibrator.vibration_xml_apis") @NonNull public static android.os.vibrator.persistence.ParsedVibration parse(@NonNull java.io.InputStream) throws java.io.IOException;
		method @FlaggedApi("android.os.vibrator.vibration_xml_apis") @NonNull public static android.os.VibrationEffect parseVibrationEffect(@NonNull java.io.InputStream) throws java.io.IOException;
		public final class VibrationXmlParser {
		method @NonNull public static android.os.vibrator.persistence.ParsedVibration parse(@NonNull java.io.InputStream) throws java.io.IOException;
		method @NonNull public static android.os.VibrationEffect parseVibrationEffect(@NonNull java.io.InputStream) throws java.io.IOException;
		}

		}

core/api/test-current.txt

+2 −47

Original line number	Diff line number	Diff line
		@@ -3,48 +3,23 @@ package android {

		public static final class Manifest.permission {
		field public static final String ACCESSIBILITY_MOTION_EVENT_OBSERVING = "android.permission.ACCESSIBILITY_MOTION_EVENT_OBSERVING";
		field public static final String ACCESS_NOTIFICATIONS = "android.permission.ACCESS_NOTIFICATIONS";
		field public static final String ACTIVITY_EMBEDDING = "android.permission.ACTIVITY_EMBEDDING";
		field public static final String ADJUST_RUNTIME_PERMISSIONS_POLICY = "android.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY";
		field public static final String APPROVE_INCIDENT_REPORTS = "android.permission.APPROVE_INCIDENT_REPORTS";
		field public static final String BACKGROUND_CAMERA = "android.permission.BACKGROUND_CAMERA";
		field public static final String BIND_CELL_BROADCAST_SERVICE = "android.permission.BIND_CELL_BROADCAST_SERVICE";
		field public static final String BRIGHTNESS_SLIDER_USAGE = "android.permission.BRIGHTNESS_SLIDER_USAGE";
		field public static final String BROADCAST_CLOSE_SYSTEM_DIALOGS = "android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS";
		field public static final String CHANGE_APP_IDLE_STATE = "android.permission.CHANGE_APP_IDLE_STATE";
		field public static final String CLEAR_APP_USER_DATA = "android.permission.CLEAR_APP_USER_DATA";
		field public static final String CLEAR_FREEZE_PERIOD = "android.permission.CLEAR_FREEZE_PERIOD";
		field public static final String CONFIGURE_DISPLAY_BRIGHTNESS = "android.permission.CONFIGURE_DISPLAY_BRIGHTNESS";
		field public static final String CONTROL_DEVICE_LIGHTS = "android.permission.CONTROL_DEVICE_LIGHTS";
		field public static final String CONTROL_DEVICE_STATE = "android.permission.CONTROL_DEVICE_STATE";
		field public static final String DELETE_STAGED_HEALTH_CONNECT_REMOTE_DATA = "android.permission.DELETE_STAGED_HEALTH_CONNECT_REMOTE_DATA";
		field public static final String FORCE_DEVICE_POLICY_MANAGER_LOGS = "android.permission.FORCE_DEVICE_POLICY_MANAGER_LOGS";
		field public static final String FORCE_STOP_PACKAGES = "android.permission.FORCE_STOP_PACKAGES";
		field public static final String GRANT_RUNTIME_PERMISSIONS = "android.permission.GRANT_RUNTIME_PERMISSIONS";
		field public static final String INSTALL_TEST_ONLY_PACKAGE = "android.permission.INSTALL_TEST_ONLY_PACKAGE";
		field public static final String KEEP_UNINSTALLED_PACKAGES = "android.permission.KEEP_UNINSTALLED_PACKAGES";
		field public static final String MAKE_UID_VISIBLE = "android.permission.MAKE_UID_VISIBLE";
		field @Deprecated public static final String MANAGE_ACTIVITY_STACKS = "android.permission.MANAGE_ACTIVITY_STACKS";
		field public static final String MANAGE_ACTIVITY_TASKS = "android.permission.MANAGE_ACTIVITY_TASKS";
		field public static final String MANAGE_APP_OPS_MODES = "android.permission.MANAGE_APP_OPS_MODES";
		field public static final String MANAGE_CRATES = "android.permission.MANAGE_CRATES";
		field public static final String MANAGE_NOTIFICATION_LISTENERS = "android.permission.MANAGE_NOTIFICATION_LISTENERS";
		field public static final String MANAGE_ROLLBACKS = "android.permission.MANAGE_ROLLBACKS";
		field public static final String MANAGE_TOAST_RATE_LIMITING = "android.permission.MANAGE_TOAST_RATE_LIMITING";
		field public static final String MODIFY_HDR_CONVERSION_MODE = "android.permission.MODIFY_HDR_CONVERSION_MODE";
		field public static final String MODIFY_REFRESH_RATE_SWITCHING_TYPE = "android.permission.MODIFY_REFRESH_RATE_SWITCHING_TYPE";
		field public static final String MODIFY_USER_PREFERRED_DISPLAY_MODE = "android.permission.MODIFY_USER_PREFERRED_DISPLAY_MODE";
		field public static final String NETWORK_SETTINGS = "android.permission.NETWORK_SETTINGS";
		field public static final String NETWORK_STACK = "android.permission.NETWORK_STACK";
		field public static final String OVERRIDE_DISPLAY_MODE_REQUESTS = "android.permission.OVERRIDE_DISPLAY_MODE_REQUESTS";
		field public static final String QUERY_AUDIO_STATE = "android.permission.QUERY_AUDIO_STATE";
		field public static final String READ_CELL_BROADCASTS = "android.permission.READ_CELL_BROADCASTS";
		field public static final String READ_PRIVILEGED_PHONE_STATE = "android.permission.READ_PRIVILEGED_PHONE_STATE";
		field public static final String READ_WRITE_SYNC_DISABLED_MODE_CONFIG = "android.permission.READ_WRITE_SYNC_DISABLED_MODE_CONFIG";
		field public static final String RECORD_BACKGROUND_AUDIO = "android.permission.RECORD_BACKGROUND_AUDIO";
		field @FlaggedApi("android.permission.flags.sensitive_notification_app_protection") public static final String RECORD_SENSITIVE_CONTENT = "android.permission.RECORD_SENSITIVE_CONTENT";
		field public static final String REMAP_MODIFIER_KEYS = "android.permission.REMAP_MODIFIER_KEYS";
		field public static final String REMOVE_TASKS = "android.permission.REMOVE_TASKS";
		field public static final String REQUEST_UNIQUE_ID_ATTESTATION = "android.permission.REQUEST_UNIQUE_ID_ATTESTATION";
		field public static final String RESERVED_FOR_TESTING_SIGNATURE = "android.permission.RESERVED_FOR_TESTING_SIGNATURE";
		field public static final String RESET_APP_ERRORS = "android.permission.RESET_APP_ERRORS";
		@@ -53,19 +28,9 @@ package android {
		field public static final String SET_GAME_SERVICE = "android.permission.SET_GAME_SERVICE";
		field public static final String SET_KEYBOARD_LAYOUT = "android.permission.SET_KEYBOARD_LAYOUT";
		field public static final String START_ACTIVITIES_FROM_SDK_SANDBOX = "android.permission.START_ACTIVITIES_FROM_SDK_SANDBOX";
		field public static final String SUSPEND_APPS = "android.permission.SUSPEND_APPS";
		field public static final String TEST_BIOMETRIC = "android.permission.TEST_BIOMETRIC";
		field public static final String TEST_INPUT_METHOD = "android.permission.TEST_INPUT_METHOD";
		field public static final String TEST_MANAGE_ROLLBACKS = "android.permission.TEST_MANAGE_ROLLBACKS";
		field public static final String UPGRADE_RUNTIME_PERMISSIONS = "android.permission.UPGRADE_RUNTIME_PERMISSIONS";
		field public static final String WRITE_ALLOWLISTED_DEVICE_CONFIG = "android.permission.WRITE_ALLOWLISTED_DEVICE_CONFIG";
		field public static final String WRITE_DEVICE_CONFIG = "android.permission.WRITE_DEVICE_CONFIG";
		field @Deprecated public static final String WRITE_MEDIA_STORAGE = "android.permission.WRITE_MEDIA_STORAGE";
		field public static final String WRITE_OBB = "android.permission.WRITE_OBB";
		}

		public static final class Manifest.permission_group {
		field public static final String UNDEFINED = "android.permission-group.UNDEFINED";
		}

		public static final class R.attr {
		@@ -79,15 +44,6 @@ package android {
		field public static final int config_remoteInsetsControllerControlsSystemBars = 17891334; // 0x1110006
		}

		public static final class R.string {
		field public static final int config_defaultAssistant = 17039393; // 0x1040021
		field public static final int config_defaultDialer = 17039395; // 0x1040023
		field public static final int config_systemAutomotiveCalendarSyncManager = 17039423; // 0x104003f
		field public static final int config_systemAutomotiveCluster = 17039400; // 0x1040028
		field public static final int config_systemAutomotiveProjection = 17039401; // 0x1040029
		field public static final int config_systemGallery = 17039399; // 0x1040027
		}

		}

		package android.accessibilityservice {
		@@ -599,6 +555,7 @@ package android.app.admin {
		@RestrictedForEnvironment(environments=android.annotation.RestrictedForEnvironment.ENVIRONMENT_SDK_RUNTIME, from=android.os.Build.VERSION_CODES.UPSIDE_DOWN_CAKE) public class DevicePolicyManager {
		method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}) public void acknowledgeNewUserDisclaimer();
		method @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public void calculateHasIncompatibleAccounts();
		method @FlaggedApi("android.app.admin.flags.multi_user_management_device_provisioning") @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public void clearMultiUserDeviceManagement(@NonNull android.content.ComponentName);
		method @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public void clearOrganizationId();
		method @RequiresPermission(android.Manifest.permission.CLEAR_FREEZE_PERIOD) public void clearSystemUpdatePolicyFreezePeriodRecord();
		method @RequiresPermission(android.Manifest.permission.FORCE_DEVICE_POLICY_MANAGER_LOGS) public long forceNetworkLogs();
		@@ -793,8 +750,6 @@ package android.app.appfunctions {
		method @FlaggedApi("android.permission.flags.app_function_access_api_enabled") @RequiresPermission(android.Manifest.permission.MANAGE_APP_FUNCTION_ACCESS) public void clearAccessHistory();
		method @FlaggedApi("android.permission.flags.app_function_access_api_enabled") @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_APP_FUNCTION_ACCESS) public java.util.List<android.content.pm.SignedPackage> getAgentAllowlist();
		method @FlaggedApi("android.permission.flags.app_function_access_api_enabled") @NonNull public java.util.Set<java.lang.String> getDeviceSettingPackages();
		method @FlaggedApi("android.permission.flags.app_function_access_api_enabled") @RequiresPermission(android.Manifest.permission.MANAGE_APP_FUNCTION_ACCESS) public boolean isAgentAllowlistEnabled();
		method @FlaggedApi("android.permission.flags.app_function_access_api_enabled") @RequiresPermission(android.Manifest.permission.MANAGE_APP_FUNCTION_ACCESS) public void setAgentAllowlistEnabled(boolean);
		field public static final int ACCESS_FLAG_MASK_ALL = 31; // 0x1f
		field public static final int ACCESS_FLAG_MASK_OTHER = 6; // 0x6
		field public static final int ACCESS_FLAG_MASK_USER = 24; // 0x18
		@@ -3030,7 +2985,7 @@ package android.os.vibrator {

		package android.os.vibrator.persistence {

		@FlaggedApi("android.os.vibrator.vibration_xml_apis") public final class ParsedVibration {
		public final class ParsedVibration {
		ctor public ParsedVibration(@NonNull java.util.List<android.os.VibrationEffect>);
		}

core/java/android/app/Notification.java

+15 −8

Original line number	Diff line number	Diff line
		@@ -9289,21 +9289,23 @@ public class Notification implements Parcelable
		* This class is a "rebuilder": It attaches to a Builder object and modifies its behavior.
		* Here's an example of how this may be used:
		* <pre class="prettyprint">
		*
		* Person user = new Person.Builder().setIcon(userIcon).setName(userName).build();
		* MessagingStyle style = new MessagingStyle(user)
		* .addMessage(messages[1].getText(), messages[1].getTime(), messages[1].getPerson())
		* .addMessage(messages[2].getText(), messages[2].getTime(), messages[2].getPerson())
		* .setGroupConversation(hasMultiplePeople());
		*
		* Notification noti = new Notification.Builder()
		* Notification notif = new Notification.Builder()
		* .setContentTitle("2 new messages with " + sender.toString())
		* .setContentText(subject)
		* .setSmallIcon(R.drawable.new_message)
		* .setLargeIcon(aBitmap)
		* .setStyle(style)
		* .build();
		* </pre>
		*
		* Note that this style doesn't display the large icon set via
		* {@link Builder#setLargeIcon(Icon)}, except as a fallback group icon if the shortcut doesn't
		* include one. It can, however, display images set via {@link MessagingStyle.Message#setData}.
		*/
		public static class MessagingStyle extends Style {

		@@ -9904,7 +9906,6 @@ public class Notification implements Parcelable
		@NonNull
		private RemoteViews makeMessagingView(int viewType) {
		boolean isCollapsed = viewType != StandardTemplateParams.VIEW_TYPE_EXPANDED;
		boolean hideRightIcons = viewType != StandardTemplateParams.VIEW_TYPE_NORMAL;
		boolean isConversationLayout = mConversationType != CONVERSATION_TYPE_LEGACY;
		boolean isImportantConversation = mConversationType == CONVERSATION_TYPE_IMPORTANT;
		boolean isLegacyHeaderless = !isConversationLayout && isCollapsed;
		@@ -9939,8 +9940,8 @@ public class Notification implements Parcelable
		.viewType(viewType)
		.highlightExpander(isConversationLayout)
		.hideProgress(true)
		.hideLeftIcon(isOneToOne)
		.hideRightIcon(hideRightIcons \|\| isOneToOne);
		.hideLeftIcon(true)
		.hideRightIcon(true);
		if (notificationsRedesignTemplates()) {
		String lastMessage = !mMessages.isEmpty()
		? mMessages.getLast().mText.toString() : null;
		@@ -11080,6 +11081,9 @@ public class Notification implements Parcelable
		* .setStyle(Notification.CallStyle.forIncomingCall(caller, declineIntent, answerIntent))
		* .build();
		* </pre>
		*
		* <p>Note that this style doesn't display the large icon set via
		* {@link Builder#setLargeIcon(Icon)}.
		*/
		public static class CallStyle extends Style {
		/**
		@@ -11648,7 +11652,7 @@ public class Notification implements Parcelable
		* <p>To use this style with your Notification, feed it to
		* {@link Notification.Builder#setStyle(android.app.Notification.Style)} like so:
		* <pre class="prettyprint">
		* new Notification.Builder(context)
		* Notification notif = new Notification.Builder(context)
		* .setStyle(new MetricStyle()
		* .addMetric(new Metric(new Metric.FixedInt(1979), "Steps"))
		* .addMetric(new Metric(
		@@ -11658,6 +11662,9 @@ public class Notification implements Parcelable
		*
		* <p>A MetricStyle must contain at least one {@link Metric} object to be valid; an invalid
		* style will be rejected when {@link Builder#build()} is called.
		*
		* <p>Note that this style doesn't display the large icon set via
		* {@link Builder#setLargeIcon(Icon)}.
		*/
		@FlaggedApi(Flags.FLAG_API_METRIC_STYLE)
		public static final class MetricStyle extends Style {
		@@ -13927,7 +13934,7 @@ public class Notification implements Parcelable
		* <p>To use this style with your Notification, feed it to
		* {@link Notification.Builder#setStyle(android.app.Notification.Style)} like so:
		* <pre class="prettyprint">
		* Notification noti = new Notification.Builder()
		* Notification notif = new Notification.Builder()
		* .setSmallIcon(R.drawable.ic_stat_player)
		* .setLargeIcon(albumArtBitmap))
		* .setCustomContentView(contentView);