Merge "Cleanup Frontend Status" into rvc-dev am: 3fe090f737 am: 2654be0d36 (736751a8) · Commits · e / os / android_frameworks_base

api/system-current.txt

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -5756,7 +5756,7 @@ package android.media.tv.tuner.frontend {

	public class FrontendStatus {		public class FrontendStatus {
	method public int getAgc();		method public int getAgc();
	method @NonNull public android.media.tv.tuner.frontend.FrontendStatus.Atsc3PlpInfo[] getAtsc3PlpInfo();		method @NonNull public android.media.tv.tuner.frontend.FrontendStatus.Atsc3PlpTuningInfo[] getAtsc3PlpTuningInfo();
	method public int getBer();		method public int getBer();
	method public int getFreqOffset();		method public int getFreqOffset();
	method public int getHierarchy();		method public int getHierarchy();
	@@ -5776,7 +5776,7 @@ package android.media.tv.tuner.frontend {
	method public boolean isDemodLocked();		method public boolean isDemodLocked();
	method public boolean isEwbs();		method public boolean isEwbs();
	method public boolean isLnaOn();		method public boolean isLnaOn();
	method public boolean isRfLock();		method public boolean isRfLocked();
	field public static final int FRONTEND_STATUS_TYPE_AGC = 14; // 0xe		field public static final int FRONTEND_STATUS_TYPE_AGC = 14; // 0xe
	field public static final int FRONTEND_STATUS_TYPE_ATSC3_PLP_INFO = 21; // 0x15		field public static final int FRONTEND_STATUS_TYPE_ATSC3_PLP_INFO = 21; // 0x15
	field public static final int FRONTEND_STATUS_TYPE_BER = 2; // 0x2		field public static final int FRONTEND_STATUS_TYPE_BER = 2; // 0x2
	@@ -5801,10 +5801,10 @@ package android.media.tv.tuner.frontend {
	field public static final int FRONTEND_STATUS_TYPE_SYMBOL_RATE = 7; // 0x7		field public static final int FRONTEND_STATUS_TYPE_SYMBOL_RATE = 7; // 0x7
	}		}

	public static class FrontendStatus.Atsc3PlpInfo {		public static class FrontendStatus.Atsc3PlpTuningInfo {
	method public int getPlpId();		method public int getPlpId();
	method public int getUec();		method public int getUec();
	method public boolean isLock();		method public boolean isLocked();
	}		}

	public class Isdbs3FrontendCapabilities extends android.media.tv.tuner.frontend.FrontendCapabilities {		public class Isdbs3FrontendCapabilities extends android.media.tv.tuner.frontend.FrontendCapabilities {

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

+9 −9

Original line number	Original line	Diff line number	Diff line
	@@ -214,7 +214,7 @@ public class FrontendStatus {
	private Integer mFreqOffset;		private Integer mFreqOffset;
	private Integer mHierarchy;		private Integer mHierarchy;
	private Boolean mIsRfLocked;		private Boolean mIsRfLocked;
	private Atsc3PlpInfo[] mPlpInfo;		private Atsc3PlpTuningInfo[] mPlpInfo;

	// Constructed and fields set by JNI code.		// Constructed and fields set by JNI code.
	private FrontendStatus() {		private FrontendStatus() {
	@@ -419,7 +419,7 @@ public class FrontendStatus {
	/**		/**
	* Gets lock status for RF.		* Gets lock status for RF.
	*/		*/
	public boolean isRfLock() {		public boolean isRfLocked() {
	if (mIsRfLocked == null) {		if (mIsRfLocked == null) {
	throw new IllegalStateException();		throw new IllegalStateException();
	}		}
	@@ -429,7 +429,7 @@ public class FrontendStatus {
	* Gets an array of PLP status for tuned PLPs for ATSC3 frontend.		* Gets an array of PLP status for tuned PLPs for ATSC3 frontend.
	*/		*/
	@NonNull		@NonNull
	public Atsc3PlpInfo[] getAtsc3PlpInfo() {		public Atsc3PlpTuningInfo[] getAtsc3PlpTuningInfo() {
	if (mPlpInfo == null) {		if (mPlpInfo == null) {
	throw new IllegalStateException();		throw new IllegalStateException();
	}		}
	@@ -439,14 +439,14 @@ public class FrontendStatus {
	/**		/**
	* Status for each tuning Physical Layer Pipes.		* Status for each tuning Physical Layer Pipes.
	*/		*/
	public static class Atsc3PlpInfo {		public static class Atsc3PlpTuningInfo {
	private final int mPlpId;		private final int mPlpId;
	private final boolean mIsLock;		private final boolean mIsLocked;
	private final int mUec;		private final int mUec;

	private Atsc3PlpInfo(int plpId, boolean isLock, int uec) {		private Atsc3PlpTuningInfo(int plpId, boolean isLocked, int uec) {
	mPlpId = plpId;		mPlpId = plpId;
	mIsLock = isLock;		mIsLocked = isLocked;
	mUec = uec;		mUec = uec;
	}		}

	@@ -459,8 +459,8 @@ public class FrontendStatus {
	/**		/**
	* Gets Demod Lock/Unlock status of this particular PLP.		* Gets Demod Lock/Unlock status of this particular PLP.
	*/		*/
	public boolean isLock() {		public boolean isLocked() {
	return mIsLock;		return mIsLocked;
	}		}
	/**		/**
	* Gets Uncorrectable Error Counts (UEC) of this particular PLP since last tune operation.		* Gets Uncorrectable Error Counts (UEC) of this particular PLP since last tune operation.