Snap for 12838584 from 0a30919eff26db657287e9c37bacde3a02b466d0 to 25Q2-release (a83bc8db) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+27 −21

Original line number	Diff line number	Diff line
		@@ -5157,8 +5157,8 @@ package android.hardware.contexthub {
		}

		@FlaggedApi("android.chre.flags.offload_api") public final class HubMessage implements android.os.Parcelable {
		method @NonNull public static android.hardware.contexthub.HubMessage createMessage(int, @NonNull byte[]);
		method @NonNull public static android.hardware.contexthub.HubMessage createMessage(int, @NonNull byte[], @NonNull android.hardware.contexthub.HubMessage.DeliveryParams);
		ctor public HubMessage(int, @NonNull byte[]);
		ctor public HubMessage(int, @NonNull byte[], @NonNull android.hardware.contexthub.HubMessage.DeliveryParams);
		method public int describeContents();
		method @NonNull public byte[] getMessageBody();
		method public int getMessageType();
		@@ -5167,9 +5167,8 @@ package android.hardware.contexthub {
		}

		public static class HubMessage.DeliveryParams {
		ctor public HubMessage.DeliveryParams(boolean);
		method public boolean isResponseRequired();
		method @NonNull public static android.hardware.contexthub.HubMessage.DeliveryParams makeBasic();
		method @NonNull public android.hardware.contexthub.HubMessage.DeliveryParams setResponseRequired(boolean);
		}

		@FlaggedApi("android.chre.flags.offload_api") public final class HubServiceInfo implements android.os.Parcelable {
		@@ -12261,7 +12260,6 @@ package android.provider {
		}

		@FlaggedApi("com.android.server.telecom.flags.telecom_mainline_blocked_numbers_manager") public static final class BlockedNumbersManager.BlockSuppressionStatus {
		ctor public BlockedNumbersManager.BlockSuppressionStatus(boolean, long);
		method public boolean getIsSuppressed();
		method public long getUntilTimestampMillis();
		}
		@@ -12730,9 +12728,9 @@ package android.security.authenticationpolicy {
		package android.security.intrusiondetection {

		@FlaggedApi("android.security.afl_api") public final class IntrusionDetectionEvent implements android.os.Parcelable {
		ctor public IntrusionDetectionEvent(@NonNull android.app.admin.SecurityLog.SecurityEvent);
		ctor public IntrusionDetectionEvent(@NonNull android.app.admin.DnsEvent);
		ctor public IntrusionDetectionEvent(@NonNull android.app.admin.ConnectEvent);
		method @NonNull public static android.security.intrusiondetection.IntrusionDetectionEvent createForConnectEvent(@NonNull android.app.admin.ConnectEvent);
		method @NonNull public static android.security.intrusiondetection.IntrusionDetectionEvent createForDnsEvent(@NonNull android.app.admin.DnsEvent);
		method @NonNull public static android.security.intrusiondetection.IntrusionDetectionEvent createForSecurityEvent(@NonNull android.app.admin.SecurityLog.SecurityEvent);
		method @FlaggedApi("android.security.afl_api") public int describeContents();
		method @NonNull public android.app.admin.ConnectEvent getConnectEvent();
		method @NonNull public android.app.admin.DnsEvent getDnsEvent();
		@@ -18684,7 +18682,7 @@ package android.telephony.satellite {
		method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public int registerForProvisionStateChanged(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.satellite.SatelliteProvisionStateCallback);
		method @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void registerForSatelliteDisallowedReasonsChanged(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.satellite.SatelliteDisallowedReasonsCallback);
		method @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public int registerForSelectedNbIotSatelliteSubscriptionChanged(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.satellite.SelectedNbIotSatelliteSubscriptionCallback);
		method @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public int registerForSupportedStateChanged(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.satellite.SatelliteSupportedStateCallback);
		method @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public int registerForSupportedStateChanged(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Boolean>);
		method @FlaggedApi("com.android.internal.telephony.flags.carrier_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void removeAttachRestrictionForCarrier(int, int, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);
		method @FlaggedApi("com.android.internal.telephony.flags.carrier_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void requestAttachEnabledForCarrier(int, boolean, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);
		method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void requestCapabilities(@NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<android.telephony.satellite.SatelliteCapabilities,android.telephony.satellite.SatelliteManager.SatelliteException>);
		@@ -18713,7 +18711,7 @@ package android.telephony.satellite {
		method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void unregisterForProvisionStateChanged(@NonNull android.telephony.satellite.SatelliteProvisionStateCallback);
		method @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void unregisterForSatelliteDisallowedReasonsChanged(@NonNull android.telephony.satellite.SatelliteDisallowedReasonsCallback);
		method @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void unregisterForSelectedNbIotSatelliteSubscriptionChanged(@NonNull android.telephony.satellite.SelectedNbIotSatelliteSubscriptionCallback);
		method @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void unregisterForSupportedStateChanged(@NonNull android.telephony.satellite.SatelliteSupportedStateCallback);
		method @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void unregisterForSupportedStateChanged(@NonNull java.util.function.Consumer<java.lang.Boolean>);
		field @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") public static final String ACTION_SATELLITE_START_NON_EMERGENCY_SESSION = "android.telephony.satellite.action.SATELLITE_START_NON_EMERGENCY_SESSION";
		field @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") public static final String ACTION_SATELLITE_SUBSCRIBER_ID_LIST_CHANGED = "android.telephony.satellite.action.SATELLITE_SUBSCRIBER_ID_LIST_CHANGED";
		field @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") public static final int DATAGRAM_TYPE_CHECK_PENDING_INCOMING_SMS = 7; // 0x7
		@@ -18734,12 +18732,12 @@ package android.telephony.satellite {
		field @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public static final int DISPLAY_MODE_UNKNOWN = 0; // 0x0
		field @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public static final int EMERGENCY_CALL_TO_SATELLITE_HANDOVER_TYPE_SOS = 1; // 0x1
		field @FlaggedApi("com.android.internal.telephony.flags.carrier_enabled_satellite_flag") public static final int EMERGENCY_CALL_TO_SATELLITE_HANDOVER_TYPE_T911 = 2; // 0x2
		field @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") public static final String METADATA_SATELLITE_MANUAL_CONNECT_P2P_SUPPORT = "android.telephony.METADATA_SATELLITE_MANUAL_CONNECT_P2P_SUPPORT";
		field @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public static final int NT_RADIO_TECHNOLOGY_EMTC_NTN = 3; // 0x3
		field @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public static final int NT_RADIO_TECHNOLOGY_NB_IOT_NTN = 1; // 0x1
		field @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public static final int NT_RADIO_TECHNOLOGY_NR_NTN = 2; // 0x2
		field @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public static final int NT_RADIO_TECHNOLOGY_PROPRIETARY = 4; // 0x4
		field @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public static final int NT_RADIO_TECHNOLOGY_UNKNOWN = 0; // 0x0
		field @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") public static final String PROPERTY_SATELLITE_MANUAL_CONNECT_P2P_SUPPORT = "android.telephony.satellite.PROPERTY_SATELLITE_MANUAL_CONNECT_P2P_SUPPORT";
		field @FlaggedApi("com.android.internal.telephony.flags.carrier_enabled_satellite_flag") public static final int SATELLITE_COMMUNICATION_RESTRICTION_REASON_ENTITLEMENT = 2; // 0x2
		field @FlaggedApi("com.android.internal.telephony.flags.carrier_enabled_satellite_flag") public static final int SATELLITE_COMMUNICATION_RESTRICTION_REASON_GEOLOCATION = 1; // 0x1
		field @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") public static final int SATELLITE_COMMUNICATION_RESTRICTION_REASON_USER = 0; // 0x0
		@@ -18803,11 +18801,12 @@ package android.telephony.satellite {
		}

		@FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") public final class SatelliteModemEnableRequestAttributes implements android.os.Parcelable {
		ctor public SatelliteModemEnableRequestAttributes(boolean, boolean, boolean, @NonNull android.telephony.satellite.SatelliteSubscriptionInfo);
		method public int describeContents();
		method @NonNull public android.telephony.satellite.SatelliteSubscriptionInfo getSatelliteSubscriptionInfo();
		method public boolean isDemoMode();
		method public boolean isEmergencyMode();
		method public boolean isEnabled();
		method public boolean isForDemoMode();
		method public boolean isForEmergencyMode();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.telephony.satellite.SatelliteModemEnableRequestAttributes> CREATOR;
		}
		@@ -18817,9 +18816,10 @@ package android.telephony.satellite {
		}

		@FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") public final class SatellitePosition implements android.os.Parcelable {
		ctor public SatellitePosition(@FloatRange(from=0xffffff4c, to=180) double, @FloatRange(from=0.0) double);
		method public int describeContents();
		method public double getAltitudeKm();
		method public double getLongitudeDegrees();
		method @FloatRange(from=0.0) public double getAltitudeKm();
		method @FloatRange(from=0xffffff4c, to=180) public double getLongitudeDegrees();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.telephony.satellite.SatellitePosition> CREATOR;
		}
		@@ -18838,8 +18838,8 @@ package android.telephony.satellite {
		method public int getSubscriberIdType();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.telephony.satellite.SatelliteSubscriberInfo> CREATOR;
		field public static final int ICCID = 0; // 0x0
		field public static final int IMSI_MSISDN = 1; // 0x1
		field public static final int SUBSCRIBER_ID_TYPE_ICCID = 0; // 0x0
		field public static final int SUBSCRIBER_ID_TYPE_IMSI_MSISDN = 1; // 0x1
		}

		public static final class SatelliteSubscriberInfo.Builder {
		@@ -18875,10 +18875,6 @@ package android.telephony.satellite {
		field @NonNull public static final android.os.Parcelable.Creator<android.telephony.satellite.SatelliteSubscriptionInfo> CREATOR;
		}

		@FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") public interface SatelliteSupportedStateCallback {
		method public void onSatelliteSupportedStateChanged(boolean);
		}

		@FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public interface SatelliteTransmissionUpdateCallback {
		method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public void onReceiveDatagramStateChanged(int, int, int);
		method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public void onSatellitePositionChanged(@NonNull android.telephony.satellite.PointingInfo);
		@@ -18902,6 +18898,16 @@ package android.telephony.satellite {
		field @NonNull public static final android.os.Parcelable.Creator<android.telephony.satellite.SystemSelectionSpecifier> CREATOR;
		}

		public static final class SystemSelectionSpecifier.Builder {
		ctor public SystemSelectionSpecifier.Builder();
		method @NonNull public android.telephony.satellite.SystemSelectionSpecifier build();
		method @NonNull public android.telephony.satellite.SystemSelectionSpecifier.Builder setBands(@NonNull int[]);
		method @NonNull public android.telephony.satellite.SystemSelectionSpecifier.Builder setEarfcns(@NonNull int[]);
		method @NonNull public android.telephony.satellite.SystemSelectionSpecifier.Builder setMccMnc(@NonNull String);
		method @NonNull public android.telephony.satellite.SystemSelectionSpecifier.Builder setSatelliteInfos(@NonNull java.util.List<android.telephony.satellite.SatelliteInfo>);
		method @NonNull public android.telephony.satellite.SystemSelectionSpecifier.Builder setTagIds(@NonNull int[]);
		}

		}

		package android.text {

core/api/test-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -1677,6 +1677,7 @@ package android.hardware.devicestate {

		@FlaggedApi("android.hardware.devicestate.feature.flags.device_state_property_api") public final class DeviceState {
		ctor public DeviceState(@NonNull android.hardware.devicestate.DeviceState.Configuration);
		field @FlaggedApi("android.hardware.devicestate.feature.flags.device_state_rdm_v2") public static final int PROPERTY_FEATURE_REAR_DISPLAY_OUTER_DEFAULT = 1001; // 0x3e9
		field public static final int PROPERTY_POLICY_AVAILABLE_FOR_APP_REQUEST = 8; // 0x8
		}

core/java/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -223,6 +223,7 @@ filegroup {
		"android/os/IThermalService.aidl",
		"android/os/IPowerManager.aidl",
		"android/os/IWakeLockCallback.aidl",
		"android/os/IScreenTimeoutPolicyListener.aidl",
		],
		}

core/java/android/app/ActivityOptions.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -1892,7 +1892,7 @@ public class ActivityOptions extends ComponentOptions {
		* app to pass through touch events to it when touches fall outside the content window.
		*
		* <p> By default, touches that fall on a translucent non-touchable area of an overlaying
		* activity window are blocked from passing through to the activity below (source activity),
		* activity window may be blocked from passing through to the activity below (source activity),
		* unless the overlaying activity is from the same UID as the source activity. The source
		* activity may use this method to opt in and allow the overlaying activities from the
		* to-be-launched app to pass through touches to itself. The source activity needs to ensure
		@@ -1900,6 +1900,9 @@ public class ActivityOptions extends ComponentOptions {
		* attacks. The flag is ignored if the context calling
		* {@link Context#startActivity(Intent, Bundle)} is not an activity.
		*
		* <p> Apps with target SDK 36 and above that depend on cross-uid pass-through touches must
		* opt in to ensure that pass-through touches work correctly.
		*
		* <p> For backward compatibility, apps with target SDK 35 and below may still receive
		* pass-through touches without opt-in if the cross-uid activity is launched by the source
		* activity.

core/java/android/app/AppOpsManager.java

+1 −5

Original line number	Diff line number	Diff line
		@@ -2814,7 +2814,7 @@ public class AppOpsManager {
		.setDefaultMode(AppOpsManager.MODE_ALLOWED)
		.build(),
		new AppOpInfo.Builder(OP_TAKE_AUDIO_FOCUS, OPSTR_TAKE_AUDIO_FOCUS, "TAKE_AUDIO_FOCUS")
		.setDefaultMode(AppOpsManager.MODE_ALLOWED).build(),
		.setDefaultMode(AppOpsManager.MODE_FOREGROUND).build(),
		new AppOpInfo.Builder(OP_AUDIO_MASTER_VOLUME, OPSTR_AUDIO_MASTER_VOLUME,
		"AUDIO_MASTER_VOLUME").setSwitchCode(OP_AUDIO_MASTER_VOLUME)
		.setRestriction(UserManager.DISALLOW_ADJUST_VOLUME)
		@@ -3377,10 +3377,6 @@ public class AppOpsManager {
		* @hide
		*/
		public static @Mode int opToDefaultMode(int op) {
		if (op == OP_TAKE_AUDIO_FOCUS && roForegroundAudioControl()) {
		// when removing the flag, change the entry in sAppOpInfos for OP_TAKE_AUDIO_FOCUS
		return AppOpsManager.MODE_FOREGROUND;
		}
		return sAppOpInfos[op].defaultMode;
		}