diff --git a/api/system-current.txt b/api/system-current.txt index 4ce64178f09f9..9eb5ed996f495 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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 { 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(); diff --git a/media/java/android/media/tv/tuner/frontend/DvbcFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/DvbcFrontendSettings.java index 705d5207cc5f3..197c1c5814f19 100644 --- a/media/java/android/media/tv/tuner/frontend/DvbcFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/DvbcFrontendSettings.java @@ -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 { 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 diff --git a/media/java/android/media/tv/tuner/frontend/FrontendStatus.java b/media/java/android/media/tv/tuner/frontend/FrontendStatus.java index 63de03344219e..ea91ee9250b51 100644 --- a/media/java/android/media/tv/tuner/frontend/FrontendStatus.java +++ b/media/java/android/media/tv/tuner/frontend/FrontendStatus.java @@ -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(); }