Merge "Rename Ext to Extension" into main (5348eb5b) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+5 −5

media/java/android/media/tv/tuner/frontend/FrontendStatus.java

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -63,7 +63,7 @@ public class FrontendStatus {
	FRONTEND_STATUS_TYPE_DVBT_CELL_IDS, FRONTEND_STATUS_TYPE_ATSC3_ALL_PLP_INFO,		FRONTEND_STATUS_TYPE_DVBT_CELL_IDS, FRONTEND_STATUS_TYPE_ATSC3_ALL_PLP_INFO,
	FRONTEND_STATUS_TYPE_IPTV_CONTENT_URL, FRONTEND_STATUS_TYPE_IPTV_PACKETS_LOST,		FRONTEND_STATUS_TYPE_IPTV_CONTENT_URL, FRONTEND_STATUS_TYPE_IPTV_PACKETS_LOST,
	FRONTEND_STATUS_TYPE_IPTV_PACKETS_RECEIVED, FRONTEND_STATUS_TYPE_IPTV_WORST_JITTER_MS,		FRONTEND_STATUS_TYPE_IPTV_PACKETS_RECEIVED, FRONTEND_STATUS_TYPE_IPTV_WORST_JITTER_MS,
	FRONTEND_STATUS_TYPE_IPTV_AVERAGE_JITTER_MS, FRONTEND_STATUS_TYPE_STANDARD_EXT})		FRONTEND_STATUS_TYPE_IPTV_AVERAGE_JITTER_MS, FRONTEND_STATUS_TYPE_STANDARD_EXTENSION})
	@Retention(RetentionPolicy.SOURCE)		@Retention(RetentionPolicy.SOURCE)
	public @interface FrontendStatusType {}		public @interface FrontendStatusType {}

	@@ -317,7 +317,7 @@ public class FrontendStatus {
	* Standard extension.		* Standard extension.
	*/		*/
	@FlaggedApi(Flags.FLAG_TUNER_W_APIS)		@FlaggedApi(Flags.FLAG_TUNER_W_APIS)
	public static final int FRONTEND_STATUS_TYPE_STANDARD_EXT =		public static final int FRONTEND_STATUS_TYPE_STANDARD_EXTENSION =
	android.hardware.tv.tuner.FrontendStatusType.STANDARD_EXT;		android.hardware.tv.tuner.FrontendStatusType.STANDARD_EXT;

	/** @hide */		/** @hide */
	@@ -567,7 +567,7 @@ public class FrontendStatus {
	private Long mIptvPacketsReceived;		private Long mIptvPacketsReceived;
	private Integer mIptvWorstJitterMs;		private Integer mIptvWorstJitterMs;
	private Integer mIptvAverageJitterMs;		private Integer mIptvAverageJitterMs;
	private StandardExt mStandardExt;		private StandardExtension mStandardExtension;

	// Constructed and fields set by JNI code.		// Constructed and fields set by JNI code.
	private FrontendStatus() {		private FrontendStatus() {
	@@ -1298,12 +1298,12 @@ public class FrontendStatus {
	*/		*/
	@NonNull		@NonNull
	@FlaggedApi(Flags.FLAG_TUNER_W_APIS)		@FlaggedApi(Flags.FLAG_TUNER_W_APIS)
	public StandardExt getStandardExt() {		public StandardExtension getStandardExtension() {
	TunerVersionChecker.checkHigherOrEqualVersionTo(		TunerVersionChecker.checkHigherOrEqualVersionTo(
	TunerVersionChecker.TUNER_VERSION_4_0, "StandardExt status");		TunerVersionChecker.TUNER_VERSION_4_0, "StandardExtension status");
	if (mStandardExt == null) {		if (mStandardExtension == null) {
	throw new IllegalStateException("StandardExt status is empty");		throw new IllegalStateException("StandardExtension status is empty");
	}		}
	return mStandardExt;		return mStandardExtension;
	}		}
	}		}

media/java/android/media/tv/tuner/frontend/StandardExt.java→media/java/android/media/tv/tuner/frontend/StandardExtension.java

+12 −12

Original line number	Original line	Diff line number	Diff line
	@@ -29,16 +29,16 @@ import android.media.tv.flags.Flags;
	*/		*/
	@SystemApi		@SystemApi
	@FlaggedApi(Flags.FLAG_TUNER_W_APIS)		@FlaggedApi(Flags.FLAG_TUNER_W_APIS)
	public final class StandardExt {		public final class StandardExtension {
	private final int mDvbsStandardExt;		private final int mDvbsStandardExtension;
	private final int mDvbtStandardExt;		private final int mDvbtStandardExtension;

	/**		/**
	* Private constructor called by JNI only.		* Private constructor called by JNI only.
	*/		*/
	private StandardExt(int dvbsStandardExt, int dvbtStandardExt) {		private StandardExtension(int dvbsStandardExtension, int dvbtStandardExtension) {
	mDvbsStandardExt = dvbsStandardExt;		mDvbsStandardExtension = dvbsStandardExtension;
	mDvbtStandardExt = dvbtStandardExt;		mDvbtStandardExtension = dvbtStandardExtension;
	}		}

	/**		/**
	@@ -50,11 +50,11 @@ public final class StandardExt {
	* @see android.media.tv.tuner.frontend.DvbsFrontendSettings		* @see android.media.tv.tuner.frontend.DvbsFrontendSettings
	*/		*/
	@DvbsFrontendSettings.Standard		@DvbsFrontendSettings.Standard
	public int getDvbsStandardExt() {		public int getDvbsStandardExtension() {
	if (mDvbsStandardExt == FrontendDvbsStandard.UNDEFINED) {		if (mDvbsStandardExtension == FrontendDvbsStandard.UNDEFINED) {
	throw new IllegalStateException("No DVB-S standard transition");		throw new IllegalStateException("No DVB-S standard transition");
	}		}
	return mDvbsStandardExt;		return mDvbsStandardExtension;
	}		}

	/**		/**
	@@ -66,10 +66,10 @@ public final class StandardExt {
	* @see android.media.tv.tuner.frontend.DvbtFrontendSettings		* @see android.media.tv.tuner.frontend.DvbtFrontendSettings
	*/		*/
	@DvbtFrontendSettings.Standard		@DvbtFrontendSettings.Standard
	public int getDvbtStandardExt() {		public int getDvbtStandardExtension() {
	if (mDvbtStandardExt == FrontendDvbtStandard.UNDEFINED) {		if (mDvbtStandardExtension == FrontendDvbtStandard.UNDEFINED) {
	throw new IllegalStateException("No DVB-T standard transition");		throw new IllegalStateException("No DVB-T standard transition");
	}		}
	return mDvbtStandardExt;		return mDvbtStandardExtension;
	}		}
	}		}

media/jni/android_media_tv_Tuner.cpp

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -2940,10 +2940,10 @@ jobject JTuner::getFrontendStatus(jintArray types) {
	break;		break;
	}		}
	case FrontendStatus::Tag::standardExt: {		case FrontendStatus::Tag::standardExt: {
	jfieldID field = env->GetFieldID(clazz, "mStandardExt",		jfieldID field = env->GetFieldID(clazz, "mStandardExtension",
	"Landroid/media/tv/tuner/frontend/StandardExt;");		"Landroid/media/tv/tuner/frontend/StandardExtension;");
	ScopedLocalRef standardExtClazz(env,		ScopedLocalRef standardExtClazz(env,
	env->FindClass("android/media/tv/tuner/frontend/StandardExt"));		env->FindClass("android/media/tv/tuner/frontend/StandardExtension"));
	jmethodID initStandardExt = env->GetMethodID(standardExtClazz.get(), "<init>",		jmethodID initStandardExt = env->GetMethodID(standardExtClazz.get(), "<init>",
	"(II)V");		"(II)V");