Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08af0322 authored by Hongguang's avatar Hongguang
Browse files

Rename NumberOfSegment to NumberOfSegments. 

Bug: 205738761
Fix: 205738761
Test: atest android.media.tv.tuner.cts
Change-Id: Ifc6367d967ee5ed69ed517c9987ff8f9b0c556b4
parent 0451ef6f

core/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -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);















  }







































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



+11
−11




























Original line number
Diff line number
Diff line








@@ -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);















            }















        }















    }

































media/jni/android_media_tv_Tuner.cpp



+1
−1




























Original line number
Diff line number
Diff line








@@ -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);