From 884ae946c86e2d96ec0a4204f6cfa9cef3371a07 Mon Sep 17 00:00:00 2001
From: shubang <shubang@google.com>
Date: Tue, 4 Feb 2020 17:51:47 -0800
Subject: [PATCH] Fix: Use super Builder class for TsFilterConfiguration

Test: make;
Bug: 139308734
Change-Id: I6a62c4e50680086e2d075f5aeab3217b612657b7
---
 api/system-current.txt                        |  3 +--
 .../tuner/filter/TsFilterConfiguration.java   | 27 +++++--------------
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/api/system-current.txt b/api/system-current.txt
index 3548b6cf5e15a..50c4238821f55 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -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);
   }
 
diff --git a/media/java/android/media/tv/tuner/filter/TsFilterConfiguration.java b/media/java/android/media/tv/tuner/filter/TsFilterConfiguration.java
index f186de60b74ae..6a8b6daa433c0 100644
--- a/media/java/android/media/tv/tuner/filter/TsFilterConfiguration.java
+++ b/media/java/android/media/tv/tuner/filter/TsFilterConfiguration.java
@@ -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;
+        }
     }
 }