Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix: Use super Builder class for TsFilterConfiguration"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-02-11 23:44:07 +00:00
committed by Android (Google) Code Review
parent d1a06552f7 884ae946c8
commit f0c72dd6ba
2 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/system-current.txt
View File

@@ -5288,9 +5288,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);
}

27
media/java/android/media/tv/tuner/filter/TsFilterConfiguration.java
View File

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