Snap for 12784745 from 3633fa1ce69001688ca3af6f822b258cca3d6e15 to 25Q2-release (fdeaf959) · Commits · e / os / android_frameworks_base

OWNERS

+3 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,8 @@ per-file TestProtoLibraries.bp = file:platform/tools/tradefederation:/OWNERS
		per-file ravenwood = file:ravenwood/OWNERS
		per-file Ravenwood = file:ravenwood/OWNERS

		per-file PREUPLOAD.cfg = file:/PREUPLOAD_OWNERS

		per-file INPUT_OWNERS = file:/INPUT_OWNERS
		per-file ZYGOTE_OWNERS = file:/ZYGOTE_OWNERS
		per-file SQLITE_OWNERS = file:/SQLITE_OWNERS
		@@ -48,3 +50,4 @@ per-file BROADCASTS_OWNERS = file:/BROADCASTS_OWNERS
		per-file ADPF_OWNERS = file:/ADPF_OWNERS
		per-file GAME_MANAGER_OWNERS = file:/GAME_MANAGER_OWNERS
		per-file SDK_OWNERS = file:/SDK_OWNERS
		per-file PREUPLOAD_OWNERS = file:/PREUPLOAD_OWNERS

PREUPLOAD_OWNERS

0 → 100644

+2 −0

Original line number	Diff line number	Diff line
		roosa@google.com
		gsennton@google.com

api/ApiDocs.bp

+31 −1

Original line number	Diff line number	Diff line
		@@ -130,6 +130,10 @@ droidstubs {
		droidstubs {
		name: "framework-doc-stubs",
		defaults: ["android-non-updatable-doc-stubs-defaults"],
		flags: [
		// Ignore any compatibility errors, see check_api.last_released below for more information.
		"--hide-category Compatibility",
		],
		srcs: [":all-modules-public-stubs-source-exportable"],
		api_levels_module: "api_versions_public",
		aidl: {
		@@ -138,13 +142,39 @@ droidstubs {
		"packages/modules/Media/apex/aidl/stable",
		],
		},

		// Pass the previously released API to support reverting flagged APIs. Without this, reverting
		// a flagged API will cause it to be removed, even if it had previously been released. This
		// has the side effect of causing compatibility issues to be reported but they are already
		// checked elsewhere so they will be ignored, see `--hide-category Compatibility` above.
		check_api: {
		last_released: {
		api_file: ":android.api.combined.public.latest",
		removed_api_file: ":android-removed.api.combined.public.latest",
		},
		},
		}

		droidstubs {
		name: "framework-doc-system-stubs",
		defaults: ["framework-doc-stubs-sources-default"],
		flags: ["--show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\\)"],
		flags: [
		"--show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\\)",
		// Ignore any compatibility errors, see check_api.last_released below for more information.
		"--hide-category Compatibility",
		],
		api_levels_module: "api_versions_system",

		// Pass the previously released API to support reverting flagged APIs. Without this, reverting
		// a flagged API will cause it to be removed, even if it had previously been released. This
		// has the side effect of causing compatibility issues to be reported but they are already
		// checked elsewhere so they will be ignored, see `--hide-category Compatibility` above.
		check_api: {
		last_released: {
		api_file: ":android.api.combined.system.latest",
		removed_api_file: ":android-removed.api.combined.system.latest",
		},
		},
		}

		/////////////////////////////////////////////////////////////////////

core/api/current.txt

+14 −3

Original line number	Diff line number	Diff line
		@@ -280,6 +280,7 @@ package android {
		field public static final String REQUEST_COMPANION_PROFILE_COMPUTER = "android.permission.REQUEST_COMPANION_PROFILE_COMPUTER";
		field public static final String REQUEST_COMPANION_PROFILE_GLASSES = "android.permission.REQUEST_COMPANION_PROFILE_GLASSES";
		field public static final String REQUEST_COMPANION_PROFILE_NEARBY_DEVICE_STREAMING = "android.permission.REQUEST_COMPANION_PROFILE_NEARBY_DEVICE_STREAMING";
		field @FlaggedApi("android.companion.virtualdevice.flags.enable_limited_vdm_role") public static final String REQUEST_COMPANION_PROFILE_SENSOR_DEVICE_STREAMING = "android.permission.REQUEST_COMPANION_PROFILE_SENSOR_DEVICE_STREAMING";
		field public static final String REQUEST_COMPANION_PROFILE_WATCH = "android.permission.REQUEST_COMPANION_PROFILE_WATCH";
		field public static final String REQUEST_COMPANION_RUN_IN_BACKGROUND = "android.permission.REQUEST_COMPANION_RUN_IN_BACKGROUND";
		field public static final String REQUEST_COMPANION_SELF_MANAGED = "android.permission.REQUEST_COMPANION_SELF_MANAGED";
		@@ -10065,6 +10066,7 @@ package android.companion {
		field @RequiresPermission(android.Manifest.permission.REQUEST_COMPANION_PROFILE_COMPUTER) public static final String DEVICE_PROFILE_COMPUTER = "android.app.role.COMPANION_DEVICE_COMPUTER";
		field @RequiresPermission(android.Manifest.permission.REQUEST_COMPANION_PROFILE_GLASSES) public static final String DEVICE_PROFILE_GLASSES = "android.app.role.COMPANION_DEVICE_GLASSES";
		field @RequiresPermission(android.Manifest.permission.REQUEST_COMPANION_PROFILE_NEARBY_DEVICE_STREAMING) public static final String DEVICE_PROFILE_NEARBY_DEVICE_STREAMING = "android.app.role.COMPANION_DEVICE_NEARBY_DEVICE_STREAMING";
		field @FlaggedApi("android.companion.virtualdevice.flags.enable_limited_vdm_role") @RequiresPermission(android.Manifest.permission.REQUEST_COMPANION_PROFILE_SENSOR_DEVICE_STREAMING) public static final String DEVICE_PROFILE_SENSOR_DEVICE_STREAMING = "android.app.role.COMPANION_DEVICE_SENSOR_DEVICE_STREAMING";
		field public static final String DEVICE_PROFILE_WATCH = "android.app.role.COMPANION_DEVICE_WATCH";
		}

		@@ -13380,6 +13382,7 @@ package android.content.pm {
		method @NonNull public abstract android.graphics.drawable.Drawable getUserBadgedDrawableForDensity(@NonNull android.graphics.drawable.Drawable, @NonNull android.os.UserHandle, @Nullable android.graphics.Rect, int);
		method @NonNull public abstract android.graphics.drawable.Drawable getUserBadgedIcon(@NonNull android.graphics.drawable.Drawable, @NonNull android.os.UserHandle);
		method @NonNull public abstract CharSequence getUserBadgedLabel(@NonNull CharSequence, @NonNull android.os.UserHandle);
		method @FlaggedApi("android.content.pm.cloud_compilation_pm") @NonNull public static android.content.pm.SigningInfo getVerifiedSigningInfo(@NonNull String, int) throws android.content.pm.SigningInfoException;
		method @NonNull @RequiresPermission(value="android.permission.WHITELIST_RESTRICTED_PERMISSIONS", conditional=true) public java.util.Set<java.lang.String> getWhitelistedRestrictedPermissions(@NonNull String, int);
		method @Nullable public abstract android.content.res.XmlResourceParser getXml(@NonNull String, @XmlRes int, @Nullable android.content.pm.ApplicationInfo);
		method public boolean hasSigningCertificate(@NonNull String, @NonNull byte[], int);
		@@ -14025,8 +14028,17 @@ package android.content.pm {
		method public android.content.pm.Signature[] getSigningCertificateHistory();
		method public boolean hasMultipleSigners();
		method public boolean hasPastSigningCertificates();
		method @FlaggedApi("android.content.pm.cloud_compilation_pm") public boolean signersMatchExactly(@NonNull android.content.pm.SigningInfo);
		method public void writeToParcel(android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.content.pm.SigningInfo> CREATOR;
		field @FlaggedApi("android.content.pm.cloud_compilation_pm") public static final int VERSION_JAR = 1; // 0x1
		field @FlaggedApi("android.content.pm.cloud_compilation_pm") public static final int VERSION_SIGNING_BLOCK_V2 = 2; // 0x2
		field @FlaggedApi("android.content.pm.cloud_compilation_pm") public static final int VERSION_SIGNING_BLOCK_V3 = 3; // 0x3
		field @FlaggedApi("android.content.pm.cloud_compilation_pm") public static final int VERSION_SIGNING_BLOCK_V4 = 4; // 0x4
		}

		@FlaggedApi("android.content.pm.cloud_compilation_pm") public class SigningInfoException extends java.lang.Exception {
		method @FlaggedApi("android.content.pm.cloud_compilation_pm") public int getCode();
		}

		public final class VersionedPackage implements android.os.Parcelable {
		@@ -45059,6 +45071,7 @@ package android.telephony {
		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_roaming_nb_iot_ntn") public static final String KEY_SATELLITE_ESOS_SUPPORTED_BOOL = "satellite_esos_supported_bool";
		field @FlaggedApi("com.android.internal.telephony.flags.satellite_25q4_apis") public static final String KEY_SATELLITE_IGNORE_DATA_ROAMING_SETTING_BOOL = "satellite_ignore_data_roaming_setting_bool";
		field @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") public static final String KEY_SATELLITE_INFORMATION_REDIRECT_URL_STRING = "satellite_information_redirect_url_string";
		field @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") public static final String KEY_SATELLITE_NIDD_APN_NAME_STRING = "satellite_nidd_apn_name_string";
		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";
		@@ -47463,7 +47476,6 @@ package android.telephony {
		field public static final long NETWORK_TYPE_BITMASK_IWLAN = 131072L; // 0x20000L
		field public static final long NETWORK_TYPE_BITMASK_LTE = 4096L; // 0x1000L
		field @Deprecated public static final long NETWORK_TYPE_BITMASK_LTE_CA = 262144L; // 0x40000L
		field @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") public static final long NETWORK_TYPE_BITMASK_NB_IOT_NTN = 1048576L; // 0x100000L
		field public static final long NETWORK_TYPE_BITMASK_NR = 524288L; // 0x80000L
		field public static final long NETWORK_TYPE_BITMASK_TD_SCDMA = 65536L; // 0x10000L
		field public static final long NETWORK_TYPE_BITMASK_UMTS = 4L; // 0x4L
		@@ -47483,7 +47495,6 @@ package android.telephony {
		field @Deprecated public static final int NETWORK_TYPE_IDEN = 11; // 0xb
		field public static final int NETWORK_TYPE_IWLAN = 18; // 0x12
		field public static final int NETWORK_TYPE_LTE = 13; // 0xd
		field @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") public static final int NETWORK_TYPE_NB_IOT_NTN = 21; // 0x15
		field public static final int NETWORK_TYPE_NR = 20; // 0x14
		field public static final int NETWORK_TYPE_TD_SCDMA = 17; // 0x11
		field public static final int NETWORK_TYPE_UMTS = 3; // 0x3
		@@ -49356,7 +49367,7 @@ package android.text {
		method public static void dumpSpans(CharSequence, android.util.Printer, String);
		method public static CharSequence ellipsize(CharSequence, android.text.TextPaint, float, android.text.TextUtils.TruncateAt);
		method public static CharSequence ellipsize(CharSequence, android.text.TextPaint, float, android.text.TextUtils.TruncateAt, boolean, @Nullable android.text.TextUtils.EllipsizeCallback);
		method public static boolean equals(CharSequence, CharSequence);
		method public static boolean equals(@Nullable CharSequence, @Nullable CharSequence);
		method public static CharSequence expandTemplate(CharSequence, java.lang.CharSequence...);
		method public static int getCapsMode(CharSequence, int, int);
		method public static void getChars(CharSequence, int, int, char[], int);

core/api/module-lib-current.txt

+0 −13

Original line number	Diff line number	Diff line
		@@ -130,7 +130,6 @@ package android.content.pm {

		public abstract class PackageManager {
		method @NonNull public String getSdkSandboxPackageName();
		method @FlaggedApi("android.content.pm.cloud_compilation_pm") @NonNull public static android.content.pm.SigningInfo getVerifiedSigningInfo(@NonNull String, int) throws android.content.pm.SigningInfoException;
		method @RequiresPermission(android.Manifest.permission.MAKE_UID_VISIBLE) public void makeUidVisible(int, int);
		field public static final String EXTRA_VERIFICATION_ROOT_HASH = "android.content.pm.extra.VERIFICATION_ROOT_HASH";
		field public static final int MATCH_STATIC_SHARED_AND_SDK_LIBRARIES = 67108864; // 0x4000000
		@@ -141,18 +140,6 @@ package android.content.pm {
		method @NonNull public String getPackageName();
		}

		public final class SigningInfo implements android.os.Parcelable {
		method @FlaggedApi("android.content.pm.cloud_compilation_pm") public boolean signersMatchExactly(@NonNull android.content.pm.SigningInfo);
		field @FlaggedApi("android.content.pm.cloud_compilation_pm") public static final int VERSION_JAR = 1; // 0x1
		field @FlaggedApi("android.content.pm.cloud_compilation_pm") public static final int VERSION_SIGNING_BLOCK_V2 = 2; // 0x2
		field @FlaggedApi("android.content.pm.cloud_compilation_pm") public static final int VERSION_SIGNING_BLOCK_V3 = 3; // 0x3
		field @FlaggedApi("android.content.pm.cloud_compilation_pm") public static final int VERSION_SIGNING_BLOCK_V4 = 4; // 0x4
		}

		@FlaggedApi("android.content.pm.cloud_compilation_pm") public class SigningInfoException extends java.lang.Exception {
		method @FlaggedApi("android.content.pm.cloud_compilation_pm") public int getCode();
		}

		}

		package android.hardware.usb {