Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "rename getFec() to getInnerFec()" into rvc-dev am: 397a93168a

Browse Source 
Change-Id: Ib4128ed4c16973cb490fecc10df2f0e85aa01e3a
This commit is contained in:
Automerger Merge Worker
2020-03-16 00:50:59 +00:00
parent 92e984c998 397a93168a
commit 54eefd23f8
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/system-current.txt
View File

@@ -5489,7 +5489,7 @@ package android.media.tv.tuner.frontend {
public class DvbcFrontendSettings extends android.media.tv.tuner.frontend.FrontendSettings {
method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public static android.media.tv.tuner.frontend.DvbcFrontendSettings.Builder builder(@NonNull android.content.Context);
method public int getAnnex();
method public long getFec();
method public long getInnerFec();
method public int getModulation();
method public int getOuterFec();
method public int getSpectralInversion();
@@ -5517,7 +5517,7 @@ package android.media.tv.tuner.frontend {
public static class DvbcFrontendSettings.Builder extends android.media.tv.tuner.frontend.FrontendSettings.Builder<android.media.tv.tuner.frontend.DvbcFrontendSettings.Builder> {
method @NonNull public android.media.tv.tuner.frontend.DvbcFrontendSettings build();
method @NonNull public android.media.tv.tuner.frontend.DvbcFrontendSettings.Builder setAnnex(int);
method @NonNull public android.media.tv.tuner.frontend.DvbcFrontendSettings.Builder setFec(long);
method @NonNull public android.media.tv.tuner.frontend.DvbcFrontendSettings.Builder setInnerFec(long);
method @NonNull public android.media.tv.tuner.frontend.DvbcFrontendSettings.Builder setModulation(int);
method @NonNull public android.media.tv.tuner.frontend.DvbcFrontendSettings.Builder setOuterFec(int);
method @NonNull public android.media.tv.tuner.frontend.DvbcFrontendSettings.Builder setSpectralInversion(int);
@@ -5783,9 +5783,9 @@ package android.media.tv.tuner.frontend {
method public int getAgc();
method @NonNull public android.media.tv.tuner.frontend.FrontendStatus.Atsc3PlpInfo[] getAtsc3PlpInfo();
method public int getBer();
method public long getFec();
method public int getFreqOffset();
method public int getHierarchy();
method public long getInnerFec();
method @NonNull public boolean[] getLayerErrors();
method public int getLnbVoltage();
method public int getMer();

20
media/java/android/media/tv/tuner/frontend/DvbcFrontendSettings.java
View File

@@ -144,17 +144,17 @@ public class DvbcFrontendSettings extends FrontendSettings {
private final int mModulation;
private final long mFec;
private final long mInnerFec;
private final int mSymbolRate;
private final int mOuterFec;
private final int mAnnex;
private final int mSpectralInversion;
private DvbcFrontendSettings(int frequency, int modulation, long fec, int symbolRate,
private DvbcFrontendSettings(int frequency, int modulation, long innerFec, int symbolRate,
int outerFec, int annex, int spectralInversion) {
super(frequency);
mModulation = modulation;
mFec = fec;
mInnerFec = innerFec;
mSymbolRate = symbolRate;
mOuterFec = outerFec;
mAnnex = annex;
@@ -172,8 +172,8 @@ public class DvbcFrontendSettings extends FrontendSettings {
* Gets Inner Forward Error Correction.
*/
@InnerFec
public long getFec() {
return mFec;
public long getInnerFec() {
return mInnerFec;
}
/**
* Gets Symbol Rate in symbols per second.
@@ -220,7 +220,7 @@ public class DvbcFrontendSettings extends FrontendSettings {
*/
public static class Builder extends FrontendSettings.Builder<Builder> {
private int mModulation;
private long mFec;
private long mInnerFec;
private int mSymbolRate;
private int mOuterFec;
private int mAnnex;
@@ -241,8 +241,8 @@ public class DvbcFrontendSettings extends FrontendSettings {
* Sets Inner Forward Error Correction.
*/
@NonNull
public Builder setFec(@InnerFec long fec) {
mFec = fec;
public Builder setInnerFec(@InnerFec long fec) {
mInnerFec = fec;
return this;
}
/**
@@ -283,8 +283,8 @@ public class DvbcFrontendSettings extends FrontendSettings {
*/
@NonNull
public DvbcFrontendSettings build() {
return new DvbcFrontendSettings(mFrequency, mModulation, mFec, mSymbolRate, mOuterFec,
mAnnex, mSpectralInversion);
return new DvbcFrontendSettings(mFrequency, mModulation, mInnerFec, mSymbolRate,
mOuterFec, mAnnex, mSpectralInversion);
}
@Override

2
media/java/android/media/tv/tuner/frontend/FrontendStatus.java
View File

@@ -304,7 +304,7 @@ public class FrontendStatus {
* and ETSI EN 302 307-2 V1.1.1.
*/
@FrontendSettings.InnerFec
public long getFec() {
public long getInnerFec() {
if (mInnerFec == null) {
throw new IllegalStateException();
}