Snap for 11157599 from 887262ed49cba5031c4fce6e8d05bb7e730d816c to 24Q1-release (36d4e7d0) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+14 −0

Original line number	Diff line number	Diff line
		@@ -56,6 +56,7 @@ aconfig_srcjars = [
		":android.credentials.flags-aconfig-java{.generated_srcjars}",
		":android.view.contentprotection.flags-aconfig-java{.generated_srcjars}",
		":com.android.server.flags.pinner-aconfig-java{.generated_srcjars}",
		":android.service.controls.flags-aconfig-java{.generated_srcjars}",
		":android.service.voice.flags-aconfig-java{.generated_srcjars}",
		":android.media.tv.flags-aconfig-java{.generated_srcjars}",
		":android.service.autofill.flags-aconfig-java{.generated_srcjars}",
		@@ -598,6 +599,19 @@ java_aconfig_library {
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		// Controls
		aconfig_declarations {
		name: "android.service.controls.flags-aconfig",
		package: "android.service.controls.flags",
		srcs: ["core/java/android/service/controls/flags/*.aconfig"],
		}

		java_aconfig_library {
		name: "android.service.controls.flags-aconfig-java",
		aconfig_declarations: "android.service.controls.flags-aconfig",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		// Voice
		aconfig_declarations {
		name: "android.service.voice.flags-aconfig",

apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -1107,7 +1107,7 @@ public class DeviceIdleController extends SystemService
		private long mDefaultInactiveTimeout =
		(30 * 60 * 1000L) / (!COMPRESS_TIME ? 1 : 10);
		private static final long DEFAULT_INACTIVE_TIMEOUT_SMALL_BATTERY =
		(15 * 60 * 1000L) / (!COMPRESS_TIME ? 1 : 10);
		(60 * 1000L) / (!COMPRESS_TIME ? 1 : 10);
		private long mDefaultSensingTimeout =
		!COMPRESS_TIME ? 4 * 60 * 1000L : 60 * 1000L;
		private long mDefaultLocatingTimeout =
		@@ -1120,7 +1120,7 @@ public class DeviceIdleController extends SystemService
		private long mDefaultIdleAfterInactiveTimeout =
		(30 * 60 * 1000L) / (!COMPRESS_TIME ? 1 : 10);
		private static final long DEFAULT_IDLE_AFTER_INACTIVE_TIMEOUT_SMALL_BATTERY =
		(15 * 60 * 1000L) / (!COMPRESS_TIME ? 1 : 10);
		(60 * 1000L) / (!COMPRESS_TIME ? 1 : 10);
		private long mDefaultIdlePendingTimeout =
		!COMPRESS_TIME ? 5 * 60 * 1000L : 30 * 1000L;
		private long mDefaultMaxIdlePendingTimeout =

core/api/current.txt

+56 −3

Original line number	Diff line number	Diff line
		@@ -9676,6 +9676,7 @@ package android.companion {
		method @Deprecated @NonNull public java.util.List<java.lang.String> getAssociations();
		method @NonNull public java.util.List<android.companion.AssociationInfo> getMyAssociations();
		method @Deprecated public boolean hasNotificationAccess(android.content.ComponentName);
		method @FlaggedApi("android.companion.perm_sync_user_consent") public boolean isPermissionTransferUserConsented(int);
		method public void requestNotificationAccess(android.content.ComponentName);
		method @FlaggedApi("android.companion.association_tag") public void setAssociationTag(int, @NonNull String);
		method @RequiresPermission(android.Manifest.permission.REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE) public void startObservingDevicePresence(@NonNull String) throws android.companion.DeviceNotAssociatedException;
		@@ -9854,7 +9855,7 @@ package android.content {
		method @NonNull public android.content.AttributionSource build();
		method @NonNull public android.content.AttributionSource.Builder setAttributionTag(@Nullable String);
		method @FlaggedApi("android.permission.flags.device_aware_permission_apis") @NonNull public android.content.AttributionSource.Builder setDeviceId(int);
		method @Deprecated @NonNull public android.content.AttributionSource.Builder setNext(@Nullable android.content.AttributionSource);
		method @NonNull public android.content.AttributionSource.Builder setNext(@Nullable android.content.AttributionSource);
		method @FlaggedApi("android.permission.flags.set_next_attribution_source") @NonNull public android.content.AttributionSource.Builder setNextAttributionSource(@NonNull android.content.AttributionSource);
		method @NonNull public android.content.AttributionSource.Builder setPackageName(@Nullable String);
		method @NonNull public android.content.AttributionSource.Builder setPid(int);
		@@ -10601,6 +10602,7 @@ package android.content {
		field public static final String RESTRICTIONS_SERVICE = "restrictions";
		field public static final String ROLE_SERVICE = "role";
		field public static final String SEARCH_SERVICE = "search";
		field @FlaggedApi("android.os.security_state_service") public static final String SECURITY_STATE_SERVICE = "security_state";
		field public static final String SENSOR_SERVICE = "sensor";
		field public static final String SHORTCUT_SERVICE = "shortcut";
		field public static final String STATUS_BAR_SERVICE = "statusbar";
		@@ -10613,6 +10615,7 @@ package android.content {
		field public static final String TELEPHONY_SUBSCRIPTION_SERVICE = "telephony_subscription_service";
		field public static final String TEXT_CLASSIFICATION_SERVICE = "textclassification";
		field public static final String TEXT_SERVICES_MANAGER_SERVICE = "textservices";
		field @FlaggedApi("android.media.tv.flags.enable_ad_service_fw") public static final String TV_AD_SERVICE = "tv_ad";
		field public static final String TV_INPUT_SERVICE = "tv_input";
		field public static final String TV_INTERACTIVE_APP_SERVICE = "tv_interactive_app";
		field public static final String UI_MODE_SERVICE = "uimode";
		@@ -11101,6 +11104,7 @@ package android.content {
		field public static final String ACTION_UID_REMOVED = "android.intent.action.UID_REMOVED";
		field @Deprecated public static final String ACTION_UMS_CONNECTED = "android.intent.action.UMS_CONNECTED";
		field @Deprecated public static final String ACTION_UMS_DISCONNECTED = "android.intent.action.UMS_DISCONNECTED";
		field @FlaggedApi("android.content.pm.archiving") public static final String ACTION_UNARCHIVE_PACKAGE = "android.intent.action.UNARCHIVE_PACKAGE";
		field @Deprecated public static final String ACTION_UNINSTALL_PACKAGE = "android.intent.action.UNINSTALL_PACKAGE";
		field public static final String ACTION_USER_BACKGROUND = "android.intent.action.USER_BACKGROUND";
		field public static final String ACTION_USER_FOREGROUND = "android.intent.action.USER_FOREGROUND";
		@@ -12366,6 +12370,7 @@ package android.content.pm {
		public class PackageInfo implements android.os.Parcelable {
		ctor public PackageInfo();
		method public int describeContents();
		method @FlaggedApi("android.content.pm.archiving") public long getArchiveTimeMillis();
		method public long getLongVersionCode();
		method public void setLongVersionCode(long);
		method public void writeToParcel(android.os.Parcel, int);
		@@ -12422,6 +12427,9 @@ package android.content.pm {
		method @NonNull public android.content.pm.PackageInstaller.Session openSession(int) throws java.io.IOException;
		method public void registerSessionCallback(@NonNull android.content.pm.PackageInstaller.SessionCallback);
		method public void registerSessionCallback(@NonNull android.content.pm.PackageInstaller.SessionCallback, @NonNull android.os.Handler);
		method @FlaggedApi("android.content.pm.archiving") @RequiresPermission(anyOf={android.Manifest.permission.INSTALL_PACKAGES, android.Manifest.permission.REQUEST_INSTALL_PACKAGES}) public void reportUnarchivalStatus(int, int, long, @Nullable android.app.PendingIntent) throws android.content.pm.PackageManager.NameNotFoundException;
		method @FlaggedApi("android.content.pm.archiving") @RequiresPermission(anyOf={android.Manifest.permission.DELETE_PACKAGES, android.Manifest.permission.REQUEST_DELETE_PACKAGES}) public void requestArchive(@NonNull String, @NonNull android.content.IntentSender) throws android.content.pm.PackageManager.NameNotFoundException;
		method @FlaggedApi("android.content.pm.archiving") @RequiresPermission(anyOf={android.Manifest.permission.INSTALL_PACKAGES, android.Manifest.permission.REQUEST_INSTALL_PACKAGES}) public void requestUnarchive(@NonNull String, @NonNull android.content.IntentSender) throws java.io.IOException, android.content.pm.PackageManager.NameNotFoundException;
		method @RequiresPermission(anyOf={android.Manifest.permission.DELETE_PACKAGES, android.Manifest.permission.REQUEST_DELETE_PACKAGES}) public void uninstall(@NonNull String, @NonNull android.content.IntentSender);
		method @RequiresPermission(anyOf={android.Manifest.permission.DELETE_PACKAGES, android.Manifest.permission.REQUEST_DELETE_PACKAGES}) public void uninstall(@NonNull android.content.pm.VersionedPackage, @NonNull android.content.IntentSender);
		method @RequiresPermission(anyOf={android.Manifest.permission.DELETE_PACKAGES, android.Manifest.permission.REQUEST_DELETE_PACKAGES}) public void uninstall(@NonNull android.content.pm.VersionedPackage, int, @NonNull android.content.IntentSender);
		@@ -12443,6 +12451,10 @@ package android.content.pm {
		field public static final String EXTRA_STATUS = "android.content.pm.extra.STATUS";
		field public static final String EXTRA_STATUS_MESSAGE = "android.content.pm.extra.STATUS_MESSAGE";
		field public static final String EXTRA_STORAGE_PATH = "android.content.pm.extra.STORAGE_PATH";
		field @FlaggedApi("android.content.pm.archiving") public static final String EXTRA_UNARCHIVE_ALL_USERS = "android.content.pm.extra.UNARCHIVE_ALL_USERS";
		field @FlaggedApi("android.content.pm.archiving") public static final String EXTRA_UNARCHIVE_ID = "android.content.pm.extra.UNARCHIVE_ID";
		field @FlaggedApi("android.content.pm.archiving") public static final String EXTRA_UNARCHIVE_PACKAGE_NAME = "android.content.pm.extra.UNARCHIVE_PACKAGE_NAME";
		field @FlaggedApi("android.content.pm.archiving") public static final String EXTRA_UNARCHIVE_STATUS = "android.content.pm.extra.UNARCHIVE_STATUS";
		field public static final int PACKAGE_SOURCE_DOWNLOADED_FILE = 4; // 0x4
		field public static final int PACKAGE_SOURCE_LOCAL_FILE = 3; // 0x3
		field public static final int PACKAGE_SOURCE_OTHER = 1; // 0x1
		@@ -12458,6 +12470,13 @@ package android.content.pm {
		field public static final int STATUS_FAILURE_TIMEOUT = 8; // 0x8
		field public static final int STATUS_PENDING_USER_ACTION = -1; // 0xffffffff
		field public static final int STATUS_SUCCESS = 0; // 0x0
		field @FlaggedApi("android.content.pm.archiving") public static final int UNARCHIVAL_ERROR_INSTALLER_DISABLED = 4; // 0x4
		field @FlaggedApi("android.content.pm.archiving") public static final int UNARCHIVAL_ERROR_INSTALLER_UNINSTALLED = 5; // 0x5
		field @FlaggedApi("android.content.pm.archiving") public static final int UNARCHIVAL_ERROR_INSUFFICIENT_STORAGE = 2; // 0x2
		field @FlaggedApi("android.content.pm.archiving") public static final int UNARCHIVAL_ERROR_NO_CONNECTIVITY = 3; // 0x3
		field @FlaggedApi("android.content.pm.archiving") public static final int UNARCHIVAL_ERROR_USER_ACTION_NEEDED = 1; // 0x1
		field @FlaggedApi("android.content.pm.archiving") public static final int UNARCHIVAL_GENERIC_ERROR = 100; // 0x64
		field @FlaggedApi("android.content.pm.archiving") public static final int UNARCHIVAL_OK = 0; // 0x0
		}

		public static final class PackageInstaller.InstallConstraints implements android.os.Parcelable {
		@@ -12621,6 +12640,7 @@ package android.content.pm {
		method @RequiresPermission(android.Manifest.permission.ENFORCE_UPDATE_OWNERSHIP) public void setRequestUpdateOwnership(boolean);
		method public void setRequireUserAction(int);
		method public void setSize(long);
		method @FlaggedApi("android.content.pm.archiving") public void setUnarchiveId(int);
		method public void setWhitelistedRestrictedPermissions(@Nullable java.util.Set<java.lang.String>);
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.content.pm.PackageInstaller.SessionParams> CREATOR;
		@@ -12650,6 +12670,7 @@ package android.content.pm {
		method public void writeToParcel(android.os.Parcel, int);
		field public int banner;
		field public int icon;
		field @FlaggedApi("android.content.pm.archiving") public boolean isArchived;
		field public int labelRes;
		field public int logo;
		field public android.os.Bundle metaData;
		@@ -12772,6 +12793,7 @@ package android.content.pm {
		method public boolean hasSigningCertificate(int, @NonNull byte[], int);
		method public abstract boolean hasSystemFeature(@NonNull String);
		method public abstract boolean hasSystemFeature(@NonNull String, int);
		method @FlaggedApi("android.content.pm.archiving") public boolean isAppArchivable(@NonNull String) throws android.content.pm.PackageManager.NameNotFoundException;
		method @RequiresPermission(value="android.permission.WHITELIST_AUTO_REVOKE_PERMISSIONS", conditional=true) public boolean isAutoRevokeWhitelisted(@NonNull String);
		method public boolean isAutoRevokeWhitelisted();
		method public boolean isDefaultApplicationIcon(@NonNull android.graphics.drawable.Drawable);
		@@ -13013,6 +13035,7 @@ package android.content.pm {
		field public static final int INSTALL_SCENARIO_FAST = 1; // 0x1
		field public static final int MATCH_ALL = 131072; // 0x20000
		field public static final int MATCH_APEX = 1073741824; // 0x40000000
		field @FlaggedApi("android.content.pm.archiving") public static final long MATCH_ARCHIVED_PACKAGES = 4294967296L; // 0x100000000L
		field public static final int MATCH_DEFAULT_ONLY = 65536; // 0x10000
		field public static final int MATCH_DIRECT_BOOT_AUTO = 268435456; // 0x10000000
		field public static final int MATCH_DIRECT_BOOT_AWARE = 524288; // 0x80000
		@@ -22034,6 +22057,19 @@ package android.media {
		method public void onJetUserIdUpdate(android.media.JetPlayer, int, int);
		}

		@FlaggedApi("android.media.audio.loudness_configurator_api") public class LoudnessCodecConfigurator {
		method @FlaggedApi("android.media.audio.loudness_configurator_api") public void addMediaCodec(@NonNull android.media.MediaCodec);
		method @FlaggedApi("android.media.audio.loudness_configurator_api") @NonNull public static android.media.LoudnessCodecConfigurator create();
		method @FlaggedApi("android.media.audio.loudness_configurator_api") @NonNull public static android.media.LoudnessCodecConfigurator create(@NonNull java.util.concurrent.Executor, @NonNull android.media.LoudnessCodecConfigurator.OnLoudnessCodecUpdateListener);
		method @FlaggedApi("android.media.audio.loudness_configurator_api") @NonNull public android.os.Bundle getLoudnessCodecParams(@NonNull android.media.AudioTrack, @NonNull android.media.MediaCodec);
		method @FlaggedApi("android.media.audio.loudness_configurator_api") public void removeMediaCodec(@NonNull android.media.MediaCodec);
		method @FlaggedApi("android.media.audio.loudness_configurator_api") public void setAudioTrack(@Nullable android.media.AudioTrack);
		}

		@FlaggedApi("android.media.audio.loudness_configurator_api") public static interface LoudnessCodecConfigurator.OnLoudnessCodecUpdateListener {
		method @FlaggedApi("android.media.audio.loudness_configurator_api") @NonNull public default android.os.Bundle onLoudnessCodecUpdate(@NonNull android.media.MediaCodec, @NonNull android.os.Bundle);
		}

		public class MediaActionSound {
		ctor public MediaActionSound();
		method public void load(int);
		@@ -27302,6 +27338,13 @@ package android.media.tv {

		}

		package android.media.tv.ad {

		@FlaggedApi("android.media.tv.flags.enable_ad_service_fw") public class TvAdManager {
		}

		}

		package android.media.tv.interactive {

		public final class AppLinkInfo implements android.os.Parcelable {
		@@ -32840,7 +32883,7 @@ package android.os {
		method public static android.os.Message obtain(android.os.Handler, int, Object);
		method public static android.os.Message obtain(android.os.Handler, int, int, int);
		method public static android.os.Message obtain(android.os.Handler, int, int, int, Object);
		method public android.os.Bundle peekData();
		method @Nullable public android.os.Bundle peekData();
		method public void recycle();
		method public void sendToTarget();
		method public void setAsynchronous(boolean);
		@@ -33379,6 +33422,13 @@ package android.os {
		field @NonNull public static final android.os.Parcelable.Creator<android.os.ResultReceiver> CREATOR;
		}

		@FlaggedApi("android.os.security_state_service") public class SecurityStateManager {
		method @FlaggedApi("android.os.security_state_service") @NonNull public android.os.Bundle getGlobalSecurityState();
		field public static final String KEY_KERNEL_VERSION = "kernel_version";
		field public static final String KEY_SYSTEM_SPL = "system_spl";
		field public static final String KEY_VENDOR_SPL = "vendor_spl";
		}

		public final class SharedMemory implements java.io.Closeable android.os.Parcelable {
		method public void close();
		method @NonNull public static android.os.SharedMemory create(@Nullable String, int) throws android.system.ErrnoException;
		@@ -36773,7 +36823,7 @@ package android.provider {
		field public static final String ACTION_CAST_SETTINGS = "android.settings.CAST_SETTINGS";
		field public static final String ACTION_CHANNEL_NOTIFICATION_SETTINGS = "android.settings.CHANNEL_NOTIFICATION_SETTINGS";
		field public static final String ACTION_CONDITION_PROVIDER_SETTINGS = "android.settings.ACTION_CONDITION_PROVIDER_SETTINGS";
		field public static final String ACTION_CREDENTIAL_PROVIDER = "android.settings.CREDENTIAL_PROVIDER";
		field @FlaggedApi("android.credentials.flags.new_settings_intents") public static final String ACTION_CREDENTIAL_PROVIDER = "android.settings.CREDENTIAL_PROVIDER";
		field public static final String ACTION_DATA_ROAMING_SETTINGS = "android.settings.DATA_ROAMING_SETTINGS";
		field public static final String ACTION_DATA_USAGE_SETTINGS = "android.settings.DATA_USAGE_SETTINGS";
		field public static final String ACTION_DATE_SETTINGS = "android.settings.DATE_SETTINGS";
		@@ -40059,6 +40109,9 @@ package android.service.controls {
		method public final boolean onUnbind(@NonNull android.content.Intent);
		method public abstract void performControlAction(@NonNull String, @NonNull android.service.controls.actions.ControlAction, @NonNull java.util.function.Consumer<java.lang.Integer>);
		method public static void requestAddControl(@NonNull android.content.Context, @NonNull android.content.ComponentName, @NonNull android.service.controls.Control);
		field @FlaggedApi("android.service.controls.flags.home_panel_dream") public static final int CONTROLS_SURFACE_ACTIVITY_PANEL = 0; // 0x0
		field @FlaggedApi("android.service.controls.flags.home_panel_dream") public static final int CONTROLS_SURFACE_DREAM = 1; // 0x1
		field @FlaggedApi("android.service.controls.flags.home_panel_dream") public static final String EXTRA_CONTROLS_SURFACE = "android.service.controls.extra.CONTROLS_SURFACE";
		field public static final String EXTRA_LOCKSCREEN_ALLOW_TRIVIAL_CONTROLS = "android.service.controls.extra.LOCKSCREEN_ALLOW_TRIVIAL_CONTROLS";
		field public static final String META_DATA_PANEL_ACTIVITY = "android.service.controls.META_DATA_PANEL_ACTIVITY";
		field public static final String SERVICE_CONTROLS = "android.service.controls.ControlsProviderService";

core/api/removed.txt

+0 −30

Original line number	Diff line number	Diff line
		@@ -30,36 +30,6 @@ package android.app {

		}

		package android.app.slice {

		public final class Slice implements android.os.Parcelable {
		field @Deprecated public static final String EXTRA_SLIDER_VALUE = "android.app.slice.extra.SLIDER_VALUE";
		field @Deprecated public static final String SUBTYPE_SLIDER = "slider";
		}

		public static class Slice.Builder {
		ctor @Deprecated public Slice.Builder(@NonNull android.net.Uri);
		method @Deprecated public android.app.slice.Slice.Builder addTimestamp(long, @Nullable String, java.util.List<java.lang.String>);
		method @Deprecated public android.app.slice.Slice.Builder setSpec(android.app.slice.SliceSpec);
		}

		public final class SliceItem implements android.os.Parcelable {
		method @Deprecated public long getTimestamp();
		field @Deprecated public static final String FORMAT_TIMESTAMP = "long";
		}

		public class SliceManager {
		method @Deprecated @Nullable public android.app.slice.Slice bindSlice(@NonNull android.net.Uri, @NonNull java.util.List<android.app.slice.SliceSpec>);
		method @Deprecated @Nullable public android.app.slice.Slice bindSlice(@NonNull android.content.Intent, @NonNull java.util.List<android.app.slice.SliceSpec>);
		method @Deprecated public void pinSlice(@NonNull android.net.Uri, @NonNull java.util.List<android.app.slice.SliceSpec>);
		}

		public abstract class SliceProvider extends android.content.ContentProvider {
		method @Deprecated public android.app.slice.Slice onBindSlice(android.net.Uri, java.util.List<android.app.slice.SliceSpec>);
		}

		}

		package android.app.usage {

		public class StorageStatsManager {

core/api/system-current.txt

+3 −23

File changed.

Preview size limit exceeded, changes collapsed.