Snap for 13442527 from f877d0613968dd0cc1383256cb2fe65ccfa901af to 25Q3-release (f881936e) · Commits · e / os / android_frameworks_base

api/Android.bp

+5 −0

Original line number	Diff line number	Diff line
		@@ -117,6 +117,11 @@ combined_apis {
		"framework-ranging",
		],
		default: [],
		}) + select(release_flag("RELEASE_TELEPHONY_MODULE"), {
		true: [
		"framework-telephony",
		],
		default: [],
		}),
		system_server_classpath: [
		"service-art",

boot/Android.bp

+10 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ soong_config_module_type {
		"release_crashrecovery_module",
		"release_ondevice_intelligence_module",
		"release_package_profiling_module",
		"release_telephony_module",
		],
		properties: [
		"fragments",
		@@ -195,6 +196,15 @@ custom_platform_bootclasspath {
		},
		],
		},
		release_telephony_module: {
		fragments: [
		// only used if telephony is enabled.
		{
		apex: "com.android.telephony",
		module: "com.android.telephony-bootclasspath-fragment",
		},
		],
		},
		},

		// Additional information needed by hidden api processing.

core/api/system-current.txt

+26 −26

Original line number	Diff line number	Diff line
		@@ -6589,7 +6589,7 @@ package android.hardware.radio {
		method public void addOnCompleteListener(@NonNull android.hardware.radio.ProgramList.OnCompleteListener);
		method public void close();
		method @Deprecated @Nullable public android.hardware.radio.RadioManager.ProgramInfo get(@NonNull android.hardware.radio.ProgramSelector.Identifier);
		method @FlaggedApi("android.hardware.radio.hd_radio_improved") @NonNull public java.util.List<android.hardware.radio.RadioManager.ProgramInfo> getProgramInfos(@NonNull android.hardware.radio.ProgramSelector.Identifier);
		method @NonNull public java.util.List<android.hardware.radio.RadioManager.ProgramInfo> getProgramInfos(@NonNull android.hardware.radio.ProgramSelector.Identifier);
		method public void registerListCallback(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.radio.ProgramList.ListCallback);
		method public void registerListCallback(@NonNull android.hardware.radio.ProgramList.ListCallback);
		method public void removeOnCompleteListener(@NonNull android.hardware.radio.ProgramList.OnCompleteListener);
		@@ -6643,7 +6643,7 @@ package android.hardware.radio {
		field @Deprecated public static final int IDENTIFIER_TYPE_DRMO_MODULATION = 11; // 0xb
		field public static final int IDENTIFIER_TYPE_DRMO_SERVICE_ID = 9; // 0x9
		field public static final int IDENTIFIER_TYPE_HD_STATION_ID_EXT = 3; // 0x3
		field @FlaggedApi("android.hardware.radio.hd_radio_improved") public static final int IDENTIFIER_TYPE_HD_STATION_LOCATION = 15; // 0xf
		field public static final int IDENTIFIER_TYPE_HD_STATION_LOCATION = 15; // 0xf
		field public static final int IDENTIFIER_TYPE_HD_STATION_NAME = 10004; // 0x2714
		field @Deprecated public static final int IDENTIFIER_TYPE_HD_SUBCHANNEL = 4; // 0x4
		field public static final int IDENTIFIER_TYPE_INVALID = 0; // 0x0
		@@ -6664,14 +6664,14 @@ package android.hardware.radio {
		field @Deprecated public static final int PROGRAM_TYPE_SXM = 7; // 0x7
		field @Deprecated public static final int PROGRAM_TYPE_VENDOR_END = 1999; // 0x7cf
		field @Deprecated public static final int PROGRAM_TYPE_VENDOR_START = 1000; // 0x3e8
		field @FlaggedApi("android.hardware.radio.hd_radio_improved") public static final int SUB_CHANNEL_HD_1 = 1; // 0x1
		field @FlaggedApi("android.hardware.radio.hd_radio_improved") public static final int SUB_CHANNEL_HD_2 = 2; // 0x2
		field @FlaggedApi("android.hardware.radio.hd_radio_improved") public static final int SUB_CHANNEL_HD_3 = 4; // 0x4
		field @FlaggedApi("android.hardware.radio.hd_radio_improved") public static final int SUB_CHANNEL_HD_4 = 8; // 0x8
		field @FlaggedApi("android.hardware.radio.hd_radio_improved") public static final int SUB_CHANNEL_HD_5 = 16; // 0x10
		field @FlaggedApi("android.hardware.radio.hd_radio_improved") public static final int SUB_CHANNEL_HD_6 = 32; // 0x20
		field @FlaggedApi("android.hardware.radio.hd_radio_improved") public static final int SUB_CHANNEL_HD_7 = 64; // 0x40
		field @FlaggedApi("android.hardware.radio.hd_radio_improved") public static final int SUB_CHANNEL_HD_8 = 128; // 0x80
		field public static final int SUB_CHANNEL_HD_1 = 1; // 0x1
		field public static final int SUB_CHANNEL_HD_2 = 2; // 0x2
		field public static final int SUB_CHANNEL_HD_3 = 4; // 0x4
		field public static final int SUB_CHANNEL_HD_4 = 8; // 0x8
		field public static final int SUB_CHANNEL_HD_5 = 16; // 0x10
		field public static final int SUB_CHANNEL_HD_6 = 32; // 0x20
		field public static final int SUB_CHANNEL_HD_7 = 64; // 0x40
		field public static final int SUB_CHANNEL_HD_8 = 128; // 0x80
		}

		public static final class ProgramSelector.Identifier implements android.os.Parcelable {
		@@ -6789,8 +6789,8 @@ package android.hardware.radio {
		field public static final int CONFIG_DAB_FM_LINKING = 7; // 0x7
		field public static final int CONFIG_DAB_FM_SOFT_LINKING = 9; // 0x9
		field @Deprecated public static final int CONFIG_FORCE_ANALOG = 2; // 0x2
		field @FlaggedApi("android.hardware.radio.hd_radio_improved") public static final int CONFIG_FORCE_ANALOG_AM = 11; // 0xb
		field @FlaggedApi("android.hardware.radio.hd_radio_improved") public static final int CONFIG_FORCE_ANALOG_FM = 10; // 0xa
		field public static final int CONFIG_FORCE_ANALOG_AM = 11; // 0xb
		field public static final int CONFIG_FORCE_ANALOG_FM = 10; // 0xa
		field public static final int CONFIG_FORCE_DIGITAL = 3; // 0x3
		field public static final int CONFIG_FORCE_MONO = 1; // 0x1
		field public static final int CONFIG_RDS_AF = 4; // 0x4
		@@ -6916,11 +6916,11 @@ package android.hardware.radio {
		method @Deprecated public int getSubChannel();
		method @NonNull public java.util.Map<java.lang.String,java.lang.String> getVendorInfo();
		method @Deprecated public boolean isDigital();
		method @FlaggedApi("android.hardware.radio.hd_radio_improved") public boolean isHdAudioAvailable();
		method @FlaggedApi("android.hardware.radio.hd_radio_improved") public boolean isHdSisAvailable();
		method public boolean isHdAudioAvailable();
		method public boolean isHdSisAvailable();
		method public boolean isLive();
		method public boolean isMuted();
		method @FlaggedApi("android.hardware.radio.hd_radio_improved") public boolean isSignalAcquired();
		method public boolean isSignalAcquired();
		method public boolean isStereo();
		method public boolean isTrafficAnnouncementActive();
		method public boolean isTrafficProgram();
		@@ -6933,11 +6933,11 @@ package android.hardware.radio {
		method public boolean containsKey(String);
		method public int describeContents();
		method @Deprecated public android.graphics.Bitmap getBitmap(String);
		method @FlaggedApi("android.hardware.radio.hd_radio_improved") public int getBitmapId(@NonNull String);
		method public int getBitmapId(@NonNull String);
		method public android.hardware.radio.RadioMetadata.Clock getClock(String);
		method public int getInt(String);
		method public String getString(String);
		method @FlaggedApi("android.hardware.radio.hd_radio_improved") @NonNull public String[] getStringArray(@NonNull String);
		method @NonNull public String[] getStringArray(@NonNull String);
		method public java.util.Set<java.lang.String> keySet();
		method public int size();
		method public void writeToParcel(android.os.Parcel, int);
		@@ -6946,9 +6946,9 @@ package android.hardware.radio {
		field public static final String METADATA_KEY_ART = "android.hardware.radio.metadata.ART";
		field public static final String METADATA_KEY_ARTIST = "android.hardware.radio.metadata.ARTIST";
		field public static final String METADATA_KEY_CLOCK = "android.hardware.radio.metadata.CLOCK";
		field @FlaggedApi("android.hardware.radio.hd_radio_improved") public static final String METADATA_KEY_COMMENT_ACTUAL_TEXT = "android.hardware.radio.metadata.COMMENT_ACTUAL_TEXT";
		field @FlaggedApi("android.hardware.radio.hd_radio_improved") public static final String METADATA_KEY_COMMENT_SHORT_DESCRIPTION = "android.hardware.radio.metadata.COMMENT_SHORT_DESCRIPTION";
		field @FlaggedApi("android.hardware.radio.hd_radio_improved") public static final String METADATA_KEY_COMMERCIAL = "android.hardware.radio.metadata.COMMERCIAL";
		field public static final String METADATA_KEY_COMMENT_ACTUAL_TEXT = "android.hardware.radio.metadata.COMMENT_ACTUAL_TEXT";
		field public static final String METADATA_KEY_COMMENT_SHORT_DESCRIPTION = "android.hardware.radio.metadata.COMMENT_SHORT_DESCRIPTION";
		field public static final String METADATA_KEY_COMMERCIAL = "android.hardware.radio.metadata.COMMERCIAL";
		field public static final String METADATA_KEY_DAB_COMPONENT_NAME = "android.hardware.radio.metadata.DAB_COMPONENT_NAME";
		field public static final String METADATA_KEY_DAB_COMPONENT_NAME_SHORT = "android.hardware.radio.metadata.DAB_COMPONENT_NAME_SHORT";
		field public static final String METADATA_KEY_DAB_ENSEMBLE_NAME = "android.hardware.radio.metadata.DAB_ENSEMBLE_NAME";
		@@ -6956,9 +6956,9 @@ package android.hardware.radio {
		field public static final String METADATA_KEY_DAB_SERVICE_NAME = "android.hardware.radio.metadata.DAB_SERVICE_NAME";
		field public static final String METADATA_KEY_DAB_SERVICE_NAME_SHORT = "android.hardware.radio.metadata.DAB_SERVICE_NAME_SHORT";
		field public static final String METADATA_KEY_GENRE = "android.hardware.radio.metadata.GENRE";
		field @FlaggedApi("android.hardware.radio.hd_radio_improved") public static final String METADATA_KEY_HD_STATION_NAME_LONG = "android.hardware.radio.metadata.HD_STATION_NAME_LONG";
		field @FlaggedApi("android.hardware.radio.hd_radio_improved") public static final String METADATA_KEY_HD_STATION_NAME_SHORT = "android.hardware.radio.metadata.HD_STATION_NAME_SHORT";
		field @FlaggedApi("android.hardware.radio.hd_radio_improved") public static final String METADATA_KEY_HD_SUBCHANNELS_AVAILABLE = "android.hardware.radio.metadata.HD_SUBCHANNELS_AVAILABLE";
		field public static final String METADATA_KEY_HD_STATION_NAME_LONG = "android.hardware.radio.metadata.HD_STATION_NAME_LONG";
		field public static final String METADATA_KEY_HD_STATION_NAME_SHORT = "android.hardware.radio.metadata.HD_STATION_NAME_SHORT";
		field public static final String METADATA_KEY_HD_SUBCHANNELS_AVAILABLE = "android.hardware.radio.metadata.HD_SUBCHANNELS_AVAILABLE";
		field public static final String METADATA_KEY_ICON = "android.hardware.radio.metadata.ICON";
		field public static final String METADATA_KEY_PROGRAM_NAME = "android.hardware.radio.metadata.PROGRAM_NAME";
		field public static final String METADATA_KEY_RBDS_PTY = "android.hardware.radio.metadata.RBDS_PTY";
		@@ -6967,7 +6967,7 @@ package android.hardware.radio {
		field public static final String METADATA_KEY_RDS_PTY = "android.hardware.radio.metadata.RDS_PTY";
		field public static final String METADATA_KEY_RDS_RT = "android.hardware.radio.metadata.RDS_RT";
		field public static final String METADATA_KEY_TITLE = "android.hardware.radio.metadata.TITLE";
		field @FlaggedApi("android.hardware.radio.hd_radio_improved") public static final String METADATA_KEY_UFIDS = "android.hardware.radio.metadata.UFIDS";
		field public static final String METADATA_KEY_UFIDS = "android.hardware.radio.metadata.UFIDS";
		}

		public static final class RadioMetadata.Builder {
		@@ -6978,7 +6978,7 @@ package android.hardware.radio {
		method public android.hardware.radio.RadioMetadata.Builder putClock(String, long, int);
		method public android.hardware.radio.RadioMetadata.Builder putInt(String, int);
		method public android.hardware.radio.RadioMetadata.Builder putString(String, String);
		method @FlaggedApi("android.hardware.radio.hd_radio_improved") @NonNull public android.hardware.radio.RadioMetadata.Builder putStringArray(@NonNull String, @NonNull String[]);
		method @NonNull public android.hardware.radio.RadioMetadata.Builder putStringArray(@NonNull String, @NonNull String[]);
		}

		public static final class RadioMetadata.Clock implements android.os.Parcelable {
		@@ -6997,7 +6997,7 @@ package android.hardware.radio {
		method @RequiresPermission(android.Manifest.permission.ACCESS_BROADCAST_RADIO) public abstract void close();
		method @Deprecated @RequiresPermission(android.Manifest.permission.ACCESS_BROADCAST_RADIO) public abstract int getConfiguration(android.hardware.radio.RadioManager.BandConfig[]);
		method @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_BROADCAST_RADIO) public android.hardware.radio.ProgramList getDynamicProgramList(@Nullable android.hardware.radio.ProgramList.Filter);
		method @FlaggedApi("android.hardware.radio.hd_radio_improved") @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_BROADCAST_RADIO) public android.graphics.Bitmap getMetadataImage(int);
		method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_BROADCAST_RADIO) public android.graphics.Bitmap getMetadataImage(int);
		method @RequiresPermission(android.Manifest.permission.ACCESS_BROADCAST_RADIO) public abstract boolean getMute();
		method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_BROADCAST_RADIO) public java.util.Map<java.lang.String,java.lang.String> getParameters(@NonNull java.util.List<java.lang.String>);
		method @Deprecated @RequiresPermission(android.Manifest.permission.ACCESS_BROADCAST_RADIO) public abstract int getProgramInformation(android.hardware.radio.RadioManager.ProgramInfo[]);

core/java/android/app/ActivityThread.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -7265,7 +7265,14 @@ public final class ActivityThread extends ClientTransactionHandler
		Slog.w(TAG, "Low overhead tracing feature is not enabled");
		break;
		}

		if (profilerInfo.profileLongRunningMethods) {
		long microToNano = 1000;
		VMDebug.startLowOverheadTraceForLongRunningMethods(
		profilerInfo.durationMicros * microToNano);
		} else {
		VMDebug.startLowOverheadTraceForAllMethods();
		}
		break;
		default:
		try {

core/java/android/app/ProfilerInfo.java

+28 −3

Original line number	Diff line number	Diff line
		@@ -98,9 +98,19 @@ public class ProfilerInfo implements Parcelable {
		*/
		public final int profilerOutputVersion;

		/**
		* Indicates if we should trace long running methods for lowoverhead tracing
		*/
		public final boolean profileLongRunningMethods;

		/**
		* The duration in microseconds for which the lowoverhed tracing has to be run
		*/
		public final long durationMicros;

		public ProfilerInfo(String filename, ParcelFileDescriptor fd, int interval, boolean autoStop,
		boolean streaming, String agent, boolean attachAgentDuringBind, int clockType,
		int profilerOutputVersion) {
		int profilerOutputVersion, boolean profileLongRunningMethods, long durationMicros) {
		profileFile = filename;
		profileFd = fd;
		samplingInterval = interval;
		@@ -110,6 +120,8 @@ public class ProfilerInfo implements Parcelable {
		this.agent = agent;
		this.attachAgentDuringBind = attachAgentDuringBind;
		this.profilerOutputVersion = profilerOutputVersion;
		this.profileLongRunningMethods = profileLongRunningMethods;
		this.durationMicros = durationMicros;
		}

		public ProfilerInfo(ProfilerInfo in) {
		@@ -122,6 +134,8 @@ public class ProfilerInfo implements Parcelable {
		attachAgentDuringBind = in.attachAgentDuringBind;
		clockType = in.clockType;
		profilerOutputVersion = in.profilerOutputVersion;
		profileLongRunningMethods = in.profileLongRunningMethods;
		durationMicros = in.durationMicros;
		}

		/**
		@@ -165,7 +179,8 @@ public class ProfilerInfo implements Parcelable {
		public ProfilerInfo setAgent(String agent, boolean attachAgentDuringBind) {
		return new ProfilerInfo(this.profileFile, this.profileFd, this.samplingInterval,
		this.autoStopProfiler, this.streamingOutput, agent, attachAgentDuringBind,
		this.clockType, this.profilerOutputVersion);
		this.clockType, this.profilerOutputVersion, this.profileLongRunningMethods,
		this.durationMicros);
		}

		/**
		@@ -207,6 +222,8 @@ public class ProfilerInfo implements Parcelable {
		out.writeBoolean(attachAgentDuringBind);
		out.writeInt(clockType);
		out.writeInt(profilerOutputVersion);
		out.writeBoolean(profileLongRunningMethods);
		out.writeLong(durationMicros);
		}

		/** @hide */
		@@ -222,6 +239,8 @@ public class ProfilerInfo implements Parcelable {
		proto.write(ProfilerInfoProto.AGENT, agent);
		proto.write(ProfilerInfoProto.CLOCK_TYPE, clockType);
		proto.write(ProfilerInfoProto.PROFILER_OUTPUT_VERSION, profilerOutputVersion);
		proto.write(ProfilerInfoProto.PROFILE_LONG_RUNNING_METHODS, profileLongRunningMethods);
		proto.write(ProfilerInfoProto.DURATION_MICROS, durationMicros);
		proto.end(token);
		}

		@@ -248,6 +267,8 @@ public class ProfilerInfo implements Parcelable {
		attachAgentDuringBind = in.readBoolean();
		clockType = in.readInt();
		profilerOutputVersion = in.readInt();
		profileLongRunningMethods = in.readBoolean();
		durationMicros = in.readLong();
		}

		@Override
		@@ -265,7 +286,9 @@ public class ProfilerInfo implements Parcelable {
		&& samplingInterval == other.samplingInterval
		&& streamingOutput == other.streamingOutput && Objects.equals(agent, other.agent)
		&& clockType == other.clockType
		&& profilerOutputVersion == other.profilerOutputVersion;
		&& profilerOutputVersion == other.profilerOutputVersion
		&& profileLongRunningMethods == other.profileLongRunningMethods
		&& durationMicros == other.durationMicros;
		}

		@Override
		@@ -278,6 +301,8 @@ public class ProfilerInfo implements Parcelable {
		result = 31 * result + Objects.hashCode(agent);
		result = 31 * result + clockType;
		result = 31 * result + profilerOutputVersion;
		result = 31 * result + (profileLongRunningMethods ? 1 : 0);
		result = 31 * result + Long.hashCode(durationMicros);
		return result;
		}
		}