diff options
| -rw-r--r-- | core/api/system-current.txt | 4 | ||||
| -rw-r--r-- | media/java/android/media/tv/tuner/frontend/IsdbtFrontendSettings.java | 22 | ||||
| -rw-r--r-- | media/jni/android_media_tv_Tuner.cpp | 2 |
3 files changed, 14 insertions, 14 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index dd1760c51097..d75fde294e8e 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -7572,7 +7572,7 @@ package android.media.tv.tuner.frontend { method @NonNull public static android.media.tv.tuner.frontend.IsdbtFrontendSettings.IsdbtLayerSettings.Builder builder(); method public int getCodeRate(); method public int getModulation(); - method @IntRange(from=0, to=255) public int getNumberOfSegment(); + method @IntRange(from=0, to=255) public int getNumberOfSegments(); method public int getTimeInterleaveMode(); } @@ -7580,7 +7580,7 @@ package android.media.tv.tuner.frontend { method @NonNull public android.media.tv.tuner.frontend.IsdbtFrontendSettings.IsdbtLayerSettings build(); method @NonNull public android.media.tv.tuner.frontend.IsdbtFrontendSettings.IsdbtLayerSettings.Builder setCodeRate(int); method @NonNull public android.media.tv.tuner.frontend.IsdbtFrontendSettings.IsdbtLayerSettings.Builder setModulation(int); - method @IntRange(from=0, to=255) @NonNull public android.media.tv.tuner.frontend.IsdbtFrontendSettings.IsdbtLayerSettings.Builder setNumberOfSegment(int); + method @IntRange(from=0, to=255) @NonNull public android.media.tv.tuner.frontend.IsdbtFrontendSettings.IsdbtLayerSettings.Builder setNumberOfSegments(int); method @NonNull public android.media.tv.tuner.frontend.IsdbtFrontendSettings.IsdbtLayerSettings.Builder setTimeInterleaveMode(int); } diff --git a/media/java/android/media/tv/tuner/frontend/IsdbtFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/IsdbtFrontendSettings.java index 403bfa716702..89512a05674b 100644 --- a/media/java/android/media/tv/tuner/frontend/IsdbtFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/IsdbtFrontendSettings.java @@ -546,14 +546,14 @@ public class IsdbtFrontendSettings extends FrontendSettings { private final int mModulation; private final int mTimeInterleaveMode; private final int mCodeRate; - private final int mNumOfSegment; + private final int mNumOfSegments; private IsdbtLayerSettings( - int modulation, int timeInterleaveMode, int codeRate, int numOfSegment) { + int modulation, int timeInterleaveMode, int codeRate, int numOfSegments) { mModulation = modulation; mTimeInterleaveMode = timeInterleaveMode; mCodeRate = codeRate; - mNumOfSegment = numOfSegment; + mNumOfSegments = numOfSegments; } /** @@ -578,11 +578,11 @@ public class IsdbtFrontendSettings extends FrontendSettings { return mCodeRate; } /** - * Gets Number of Segment. + * Gets Number of Segments. */ @IntRange(from = 0, to = 0xff) - public int getNumberOfSegment() { - return mNumOfSegment; + public int getNumberOfSegments() { + return mNumOfSegments; } /** @@ -600,7 +600,7 @@ public class IsdbtFrontendSettings extends FrontendSettings { private int mModulation = MODULATION_UNDEFINED; private int mTimeInterleaveMode = TIME_INTERLEAVE_MODE_UNDEFINED; private int mCodeRate = DvbtFrontendSettings.CODERATE_UNDEFINED; - private int mNumOfSegment = 0; + private int mNumOfSegments = 0; private Builder() {} @@ -633,14 +633,14 @@ public class IsdbtFrontendSettings extends FrontendSettings { return this; } /** - * Sets number of segment. + * Sets number of segments. * * <p>Default value is 0. */ @NonNull @IntRange(from = 0, to = 0xff) - public Builder setNumberOfSegment(int numOfSegment) { - mNumOfSegment = numOfSegment; + public Builder setNumberOfSegments(int numOfSegments) { + mNumOfSegments = numOfSegments; return this; } @@ -650,7 +650,7 @@ public class IsdbtFrontendSettings extends FrontendSettings { @NonNull public IsdbtLayerSettings build() { return new IsdbtLayerSettings( - mModulation, mTimeInterleaveMode, mCodeRate, mNumOfSegment); + mModulation, mTimeInterleaveMode, mCodeRate, mNumOfSegments); } } } diff --git a/media/jni/android_media_tv_Tuner.cpp b/media/jni/android_media_tv_Tuner.cpp index 4c1ed45c5f3d..ded9652622a7 100644 --- a/media/jni/android_media_tv_Tuner.cpp +++ b/media/jni/android_media_tv_Tuner.cpp @@ -2961,7 +2961,7 @@ static FrontendSettings getIsdbtFrontendSettings(JNIEnv *env, const jobject& set frontendIsdbtSettings.layerSettings[i].coderate = static_cast<FrontendIsdbtCoderate>( env->GetIntField(layer, env->GetFieldID(layerClazz, "mCodeRate", "I"))); frontendIsdbtSettings.layerSettings[i].numOfSegment = - env->GetIntField(layer, env->GetFieldID(layerClazz, "mNumOfSegment", "I")); + env->GetIntField(layer, env->GetFieldID(layerClazz, "mNumOfSegments", "I")); } frontendSettings.set<FrontendSettings::Tag::isdbt>(frontendIsdbtSettings); |