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

core/api/system-current.txt

+5 −5

Original line number	Diff line number	Diff line
		@@ -9899,7 +9899,7 @@ package android.media.tv.tuner.frontend {
		method public int getSignalStrength();
		method public int getSnr();
		method public int getSpectralInversion();
		method @FlaggedApi("android.media.tv.flags.tuner_w_apis") @NonNull public android.media.tv.tuner.frontend.StandardExt getStandardExt();
		method @FlaggedApi("android.media.tv.flags.tuner_w_apis") @NonNull public android.media.tv.tuner.frontend.StandardExtension getStandardExtension();
		method @NonNull public int[] getStreamIds();
		method public int getSymbolRate();
		method @IntRange(from=0, to=65535) public int getSystemId();
		@@ -9954,7 +9954,7 @@ package android.media.tv.tuner.frontend {
		field public static final int FRONTEND_STATUS_TYPE_SIGNAL_STRENGTH = 6; // 0x6
		field public static final int FRONTEND_STATUS_TYPE_SNR = 1; // 0x1
		field public static final int FRONTEND_STATUS_TYPE_SPECTRAL = 10; // 0xa
		field @FlaggedApi("android.media.tv.flags.tuner_w_apis") public static final int FRONTEND_STATUS_TYPE_STANDARD_EXT = 47; // 0x2f
		field @FlaggedApi("android.media.tv.flags.tuner_w_apis") public static final int FRONTEND_STATUS_TYPE_STANDARD_EXTENSION = 47; // 0x2f
		field public static final int FRONTEND_STATUS_TYPE_STREAM_IDS = 39; // 0x27
		field public static final int FRONTEND_STATUS_TYPE_SYMBOL_RATE = 7; // 0x7
		field public static final int FRONTEND_STATUS_TYPE_T2_SYSTEM_ID = 29; // 0x1d
		@@ -10246,9 +10246,9 @@ package android.media.tv.tuner.frontend {
		method public default void onUnlocked();
		}

		@FlaggedApi("android.media.tv.flags.tuner_w_apis") public final class StandardExt {
		method public int getDvbsStandardExt();
		method public int getDvbtStandardExt();
		@FlaggedApi("android.media.tv.flags.tuner_w_apis") public final class StandardExtension {
		method public int getDvbsStandardExtension();
		method public int getDvbtStandardExtension();
		}

		}

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

+8 −8

Original line number	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_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_AVERAGE_JITTER_MS, FRONTEND_STATUS_TYPE_STANDARD_EXT})
		FRONTEND_STATUS_TYPE_IPTV_AVERAGE_JITTER_MS, FRONTEND_STATUS_TYPE_STANDARD_EXTENSION})
		@Retention(RetentionPolicy.SOURCE)
		public @interface FrontendStatusType {}

		@@ -317,7 +317,7 @@ public class FrontendStatus {
		* Standard extension.
		*/
		@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;

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

		// Constructed and fields set by JNI code.
		private FrontendStatus() {
		@@ -1298,12 +1298,12 @@ public class FrontendStatus {
		*/
		@NonNull
		@FlaggedApi(Flags.FLAG_TUNER_W_APIS)
		public StandardExt getStandardExt() {
		public StandardExtension getStandardExtension() {
		TunerVersionChecker.checkHigherOrEqualVersionTo(
		TunerVersionChecker.TUNER_VERSION_4_0, "StandardExt status");
		if (mStandardExt == null) {
		throw new IllegalStateException("StandardExt status is empty");
		TunerVersionChecker.TUNER_VERSION_4_0, "StandardExtension status");
		if (mStandardExtension == null) {
		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	Diff line number	Diff line
		@@ -29,16 +29,16 @@ import android.media.tv.flags.Flags;
		*/
		@SystemApi
		@FlaggedApi(Flags.FLAG_TUNER_W_APIS)
		public final class StandardExt {
		private final int mDvbsStandardExt;
		private final int mDvbtStandardExt;
		public final class StandardExtension {
		private final int mDvbsStandardExtension;
		private final int mDvbtStandardExtension;

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

		/**
		@@ -50,11 +50,11 @@ public final class StandardExt {
		* @see android.media.tv.tuner.frontend.DvbsFrontendSettings
		*/
		@DvbsFrontendSettings.Standard
		public int getDvbsStandardExt() {
		if (mDvbsStandardExt == FrontendDvbsStandard.UNDEFINED) {
		public int getDvbsStandardExtension() {
		if (mDvbsStandardExtension == FrontendDvbsStandard.UNDEFINED) {
		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
		*/
		@DvbtFrontendSettings.Standard
		public int getDvbtStandardExt() {
		if (mDvbtStandardExt == FrontendDvbtStandard.UNDEFINED) {
		public int getDvbtStandardExtension() {
		if (mDvbtStandardExtension == FrontendDvbtStandard.UNDEFINED) {
		throw new IllegalStateException("No DVB-T standard transition");
		}
		return mDvbtStandardExt;
		return mDvbtStandardExtension;
		}
		}

media/jni/android_media_tv_Tuner.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -2940,10 +2940,10 @@ jobject JTuner::getFrontendStatus(jintArray types) {
		break;
		}
		case FrontendStatus::Tag::standardExt: {
		jfieldID field = env->GetFieldID(clazz, "mStandardExt",
		"Landroid/media/tv/tuner/frontend/StandardExt;");
		jfieldID field = env->GetFieldID(clazz, "mStandardExtension",
		"Landroid/media/tv/tuner/frontend/StandardExtension;");
		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>",
		"(II)V");