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

Commit 884ae946 authored by shubang's avatar shubang
Browse files

Fix: Use super Builder class for TsFilterConfiguration 

Test: make;
Bug: 139308734
Change-Id: I6a62c4e50680086e2d075f5aeab3217b612657b7
parent d1ab7670

api/system-current.txt

+1 −2
Original line number Diff line number Diff line
@@ -5253,9 +5253,8 @@ package android.media.tv.tuner.filter { 
    method public int getType();

  }













  public static class TsFilterConfiguration.Builder {













  public static class TsFilterConfiguration.Builder extends android.media.tv.tuner.filter.FilterConfiguration.Builder<android.media.tv.tuner.filter.TsFilterConfiguration.Builder> {















    method @NonNull public android.media.tv.tuner.filter.TsFilterConfiguration build();













    method @NonNull public android.media.tv.tuner.filter.TsFilterConfiguration.Builder setSettings(@NonNull android.media.tv.tuner.filter.Settings);















    method @NonNull public android.media.tv.tuner.filter.TsFilterConfiguration.Builder setTpid(int);















  }















































media/java/android/media/tv/tuner/filter/TsFilterConfiguration.java



+6
−21




























Original line number
Diff line number
Diff line








@@ -17,7 +17,6 @@













package android.media.tv.tuner.filter;































import android.annotation.NonNull;













import android.annotation.Nullable;















import android.annotation.RequiresPermission;















import android.annotation.SystemApi;















import android.content.Context;









@@ -42,13 +41,6 @@ public class TsFilterConfiguration extends FilterConfiguration {













        return Filter.TYPE_TS;















    }





























    /**













     * Gets the {@link Settings} object of this filter configuration.













     */













    @Nullable













    public Settings getSettings() {













        return mSettings;













    }















    /**















     * Gets Tag Protocol ID.















     */









@@ -71,24 +63,12 @@ public class TsFilterConfiguration extends FilterConfiguration {













    /**















     * Builder for {@link TsFilterConfiguration}.















     */













    public static class Builder {













        private Settings mSettings;













    public static class Builder extends FilterConfiguration.Builder<Builder> {















        private int mTpid;































        private Builder() {















        }





























        /**













         * Sets filter settings.













         *













         * @param settings the filter settings.













         */













        @NonNull













        public Builder setSettings(@NonNull Settings settings) {













            mSettings = settings;













            return this;













        }





























        /**















         * Sets Tag Protocol ID.















         *









@@ -107,5 +87,10 @@ public class TsFilterConfiguration extends FilterConfiguration {













        public TsFilterConfiguration build() {















            return new TsFilterConfiguration(mSettings, mTpid);















        }



























        @Override













        Builder self() {













            return this;













        }















    }















}