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

Merge "Merge "Merge "Tuner API: remove TsFilterConfiguration.Builder" into rvc-dev am: abda4964c5 am: 69c1aa416f" into rvc-d1-dev-plus-aosp am: e50da1ec67" into rvc-qpr-dev-plus-aosp am: a23605bd0e

Browse Source 
Change-Id: Ibc0cfa8177db480a464ee698853c3e45a9473ea9
This commit is contained in:
Automerger Merge Worker
2020-03-11 00:14:12 +00:00
parent d8d9f0ad48 a23605bd0e
commit 3c941baef1
7 changed files with 80 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
api/system-current.txt
View File

@@ -4992,7 +4992,7 @@ package android.media.tv.tuner.dvr {
package android.media.tv.tuner.filter {
public class AlpFilterConfiguration extends android.media.tv.tuner.filter.FilterConfiguration {
public final class AlpFilterConfiguration extends android.media.tv.tuner.filter.FilterConfiguration {
method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public static android.media.tv.tuner.filter.AlpFilterConfiguration.Builder builder(@NonNull android.content.Context);
method public int getLengthType();
method public int getPacketType();
@@ -5007,10 +5007,11 @@ package android.media.tv.tuner.filter {
field public static final int PACKET_TYPE_SIGNALING = 4; // 0x4
}
public static class AlpFilterConfiguration.Builder extends android.media.tv.tuner.filter.FilterConfiguration.Builder<android.media.tv.tuner.filter.AlpFilterConfiguration.Builder> {
public static final class AlpFilterConfiguration.Builder {
method @NonNull public android.media.tv.tuner.filter.AlpFilterConfiguration build();
method @NonNull public android.media.tv.tuner.filter.AlpFilterConfiguration.Builder setLengthType(int);
method @NonNull public android.media.tv.tuner.filter.AlpFilterConfiguration.Builder setPacketType(int);
method @NonNull public android.media.tv.tuner.filter.AlpFilterConfiguration.Builder setSettings(@Nullable android.media.tv.tuner.filter.Settings);
}
public class AudioDescriptor {
@@ -5098,15 +5099,11 @@ package android.media.tv.tuner.filter {
method public abstract int getType();
}
public abstract static class FilterConfiguration.Builder<T extends android.media.tv.tuner.filter.FilterConfiguration.Builder<T>> {
method @NonNull public T setSettings(@Nullable android.media.tv.tuner.filter.Settings);
}
public abstract class FilterEvent {
ctor public FilterEvent();
}
public class IpFilterConfiguration extends android.media.tv.tuner.filter.FilterConfiguration {
public final class IpFilterConfiguration extends android.media.tv.tuner.filter.FilterConfiguration {
method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public static android.media.tv.tuner.filter.IpFilterConfiguration.Builder builder(@NonNull android.content.Context);
method @NonNull @Size(min=4, max=16) public byte[] getDstIpAddress();
method public int getDstPort();
@@ -5116,11 +5113,12 @@ package android.media.tv.tuner.filter {
method public boolean isPassthrough();
}
public static class IpFilterConfiguration.Builder extends android.media.tv.tuner.filter.FilterConfiguration.Builder<android.media.tv.tuner.filter.IpFilterConfiguration.Builder> {
public static final class IpFilterConfiguration.Builder {
method @NonNull public android.media.tv.tuner.filter.IpFilterConfiguration build();
method @NonNull public android.media.tv.tuner.filter.IpFilterConfiguration.Builder setDstIpAddress(@NonNull byte[]);
method @NonNull public android.media.tv.tuner.filter.IpFilterConfiguration.Builder setDstPort(int);
method @NonNull public android.media.tv.tuner.filter.IpFilterConfiguration.Builder setPassthrough(boolean);
method @NonNull public android.media.tv.tuner.filter.IpFilterConfiguration.Builder setSettings(@Nullable android.media.tv.tuner.filter.Settings);
method @NonNull public android.media.tv.tuner.filter.IpFilterConfiguration.Builder setSrcIpAddress(@NonNull byte[]);
method @NonNull public android.media.tv.tuner.filter.IpFilterConfiguration.Builder setSrcPort(int);
}
@@ -5144,15 +5142,16 @@ package android.media.tv.tuner.filter {
method public boolean isSecureMemory();
}
public class MmtpFilterConfiguration extends android.media.tv.tuner.filter.FilterConfiguration {
public final class MmtpFilterConfiguration extends android.media.tv.tuner.filter.FilterConfiguration {
method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public static android.media.tv.tuner.filter.MmtpFilterConfiguration.Builder builder(@NonNull android.content.Context);
method public int getMmtpPacketId();
method public int getType();
}
public static class MmtpFilterConfiguration.Builder extends android.media.tv.tuner.filter.FilterConfiguration.Builder<android.media.tv.tuner.filter.MmtpFilterConfiguration.Builder> {
public static final class MmtpFilterConfiguration.Builder {
method @NonNull public android.media.tv.tuner.filter.MmtpFilterConfiguration build();
method @NonNull public android.media.tv.tuner.filter.MmtpFilterConfiguration.Builder setMmtpPacketId(int);
method @NonNull public android.media.tv.tuner.filter.MmtpFilterConfiguration.Builder setSettings(@Nullable android.media.tv.tuner.filter.Settings);
}
public class MmtpRecordEvent extends android.media.tv.tuner.filter.FilterEvent {
@@ -5287,7 +5286,7 @@ package android.media.tv.tuner.filter {
field public static final long TIMESTAMP_UNAVAILABLE = -1L; // 0xffffffffffffffffL
}
public class TlvFilterConfiguration extends android.media.tv.tuner.filter.FilterConfiguration {
public final class TlvFilterConfiguration extends android.media.tv.tuner.filter.FilterConfiguration {
method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public static android.media.tv.tuner.filter.TlvFilterConfiguration.Builder builder(@NonNull android.content.Context);
method public int getPacketType();
method public int getType();
@@ -5300,21 +5299,23 @@ package android.media.tv.tuner.filter {
field public static final int PACKET_TYPE_SIGNALING = 254; // 0xfe
}
public static class TlvFilterConfiguration.Builder extends android.media.tv.tuner.filter.FilterConfiguration.Builder<android.media.tv.tuner.filter.TlvFilterConfiguration.Builder> {
public static final class TlvFilterConfiguration.Builder {
method @NonNull public android.media.tv.tuner.filter.TlvFilterConfiguration build();
method @NonNull public android.media.tv.tuner.filter.TlvFilterConfiguration.Builder setCompressedIpPacket(boolean);
method @NonNull public android.media.tv.tuner.filter.TlvFilterConfiguration.Builder setPacketType(int);
method @NonNull public android.media.tv.tuner.filter.TlvFilterConfiguration.Builder setPassthrough(boolean);
method @NonNull public android.media.tv.tuner.filter.TlvFilterConfiguration.Builder setSettings(@Nullable android.media.tv.tuner.filter.Settings);
}
public class TsFilterConfiguration extends android.media.tv.tuner.filter.FilterConfiguration {
public final class TsFilterConfiguration extends android.media.tv.tuner.filter.FilterConfiguration {
method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public static android.media.tv.tuner.filter.TsFilterConfiguration.Builder builder(@NonNull android.content.Context);
method public int getTpid();
method public int getType();
}
public static class TsFilterConfiguration.Builder extends android.media.tv.tuner.filter.FilterConfiguration.Builder<android.media.tv.tuner.filter.TsFilterConfiguration.Builder> {
public static final class TsFilterConfiguration.Builder {
method @NonNull public android.media.tv.tuner.filter.TsFilterConfiguration build();
method @NonNull public android.media.tv.tuner.filter.TsFilterConfiguration.Builder setSettings(@Nullable android.media.tv.tuner.filter.Settings);
method @NonNull public android.media.tv.tuner.filter.TsFilterConfiguration.Builder setTpid(int);
}

20
media/java/android/media/tv/tuner/filter/AlpFilterConfiguration.java
View File

@@ -18,6 +18,7 @@ package android.media.tv.tuner.filter;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.RequiresPermission;
import android.annotation.SystemApi;
import android.content.Context;
@@ -33,7 +34,7 @@ import java.lang.annotation.RetentionPolicy;
* @hide
*/
@SystemApi
public class AlpFilterConfiguration extends FilterConfiguration {
public final class AlpFilterConfiguration extends FilterConfiguration {
/**
* IPv4 packet type.
*/
@@ -123,9 +124,10 @@ public class AlpFilterConfiguration extends FilterConfiguration {
/**
* Builder for {@link AlpFilterConfiguration}.
*/
public static class Builder extends FilterConfiguration.Builder<Builder> {
public static final class Builder {
private int mPacketType;
private int mLengthType;
private Settings mSettings;
private Builder() {
}
@@ -149,6 +151,15 @@ public class AlpFilterConfiguration extends FilterConfiguration {
return this;
}
/**
* Sets filter settings.
*/
@NonNull
public Builder setSettings(@Nullable Settings settings) {
mSettings = settings;
return this;
}
/**
* Builds a {@link AlpFilterConfiguration} object.
*/
@@ -156,10 +167,5 @@ public class AlpFilterConfiguration extends FilterConfiguration {
public AlpFilterConfiguration build() {
return new AlpFilterConfiguration(mSettings, mPacketType, mLengthType);
}
@Override
Builder self() {
return this;
}
}
}

23
media/java/android/media/tv/tuner/filter/FilterConfiguration.java
View File

@@ -16,7 +16,6 @@
package android.media.tv.tuner.filter;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi;
@@ -48,26 +47,4 @@ public abstract class FilterConfiguration {
public Settings getSettings() {
return mSettings;
}
/**
* Builder for {@link FilterConfiguration}.
*
* @param <T> The subclass to be built.
*/
public abstract static class Builder<T extends Builder<T>> {
/* package */ Settings mSettings;
/* package */ Builder() {
}
/**
* Sets filter settings.
*/
@NonNull
public T setSettings(@Nullable Settings settings) {
mSettings = settings;
return self();
}
/* package */ abstract T self();
}
}

20
media/java/android/media/tv/tuner/filter/IpFilterConfiguration.java
View File

@@ -17,6 +17,7 @@
package android.media.tv.tuner.filter;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.RequiresPermission;
import android.annotation.Size;
import android.annotation.SystemApi;
@@ -29,7 +30,7 @@ import android.media.tv.tuner.TunerUtils;
* @hide
*/
@SystemApi
public class IpFilterConfiguration extends FilterConfiguration {
public final class IpFilterConfiguration extends FilterConfiguration {
private final byte[] mSrcIpAddress;
private final byte[] mDstIpAddress;
private final int mSrcPort;
@@ -104,12 +105,13 @@ public class IpFilterConfiguration extends FilterConfiguration {
/**
* Builder for {@link IpFilterConfiguration}.
*/
public static class Builder extends FilterConfiguration.Builder<Builder> {
public static final class Builder {
private byte[] mSrcIpAddress;
private byte[] mDstIpAddress;
private int mSrcPort;
private int mDstPort;
private boolean mPassthrough;
private Settings mSettings;
private Builder() {
}
@@ -155,6 +157,15 @@ public class IpFilterConfiguration extends FilterConfiguration {
return this;
}
/**
* Sets filter settings.
*/
@NonNull
public Builder setSettings(@Nullable Settings settings) {
mSettings = settings;
return this;
}
/**
* Builds a {@link IpFilterConfiguration} object.
*/
@@ -169,10 +180,5 @@ public class IpFilterConfiguration extends FilterConfiguration {
return new IpFilterConfiguration(
mSettings, mSrcIpAddress, mDstIpAddress, mSrcPort, mDstPort, mPassthrough);
}
@Override
Builder self() {
return this;
}
}
}

20
media/java/android/media/tv/tuner/filter/MmtpFilterConfiguration.java
View File

@@ -17,6 +17,7 @@
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;
@@ -28,7 +29,7 @@ import android.media.tv.tuner.TunerUtils;
* @hide
*/
@SystemApi
public class MmtpFilterConfiguration extends FilterConfiguration {
public final class MmtpFilterConfiguration extends FilterConfiguration {
private final int mMmtpPid;
private MmtpFilterConfiguration(Settings settings, int mmtpPid) {
@@ -65,8 +66,9 @@ public class MmtpFilterConfiguration extends FilterConfiguration {
/**
* Builder for {@link IpFilterConfiguration}.
*/
public static class Builder extends FilterConfiguration.Builder<Builder> {
public static final class Builder {
private int mMmtpPid;
private Settings mSettings;
private Builder() {
}
@@ -80,6 +82,15 @@ public class MmtpFilterConfiguration extends FilterConfiguration {
return this;
}
/**
* Sets filter settings.
*/
@NonNull
public Builder setSettings(@Nullable Settings settings) {
mSettings = settings;
return this;
}
/**
* Builds a {@link IpFilterConfiguration} object.
*/
@@ -87,10 +98,5 @@ public class MmtpFilterConfiguration extends FilterConfiguration {
public MmtpFilterConfiguration build() {
return new MmtpFilterConfiguration(mSettings, mMmtpPid);
}
@Override
Builder self() {
return this;
}
}
}

20
media/java/android/media/tv/tuner/filter/TlvFilterConfiguration.java
View File

@@ -17,6 +17,7 @@
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;
@@ -28,7 +29,7 @@ import android.media.tv.tuner.TunerUtils;
* @hide
*/
@SystemApi
public class TlvFilterConfiguration extends FilterConfiguration {
public final class TlvFilterConfiguration extends FilterConfiguration {
/**
* IPv4 packet type.
*/
@@ -108,10 +109,11 @@ public class TlvFilterConfiguration extends FilterConfiguration {
/**
* Builder for {@link TlvFilterConfiguration}.
*/
public static class Builder extends FilterConfiguration.Builder<Builder> {
public static final class Builder {
private int mPacketType;
private boolean mIsCompressedIpPacket;
private boolean mPassthrough;
private Settings mSettings;
private Builder() {
}
@@ -143,6 +145,15 @@ public class TlvFilterConfiguration extends FilterConfiguration {
return this;
}
/**
* Sets filter settings.
*/
@NonNull
public Builder setSettings(@Nullable Settings settings) {
mSettings = settings;
return this;
}
/**
* Builds a {@link TlvFilterConfiguration} object.
*/
@@ -151,10 +162,5 @@ public class TlvFilterConfiguration extends FilterConfiguration {
return new TlvFilterConfiguration(
mSettings, mPacketType, mIsCompressedIpPacket, mPassthrough);
}
@Override
Builder self() {
return this;
}
}
}

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

@@ -17,6 +17,7 @@
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;
@@ -28,7 +29,7 @@ import android.media.tv.tuner.TunerUtils;
* @hide
*/
@SystemApi
public class TsFilterConfiguration extends FilterConfiguration {
public final class TsFilterConfiguration extends FilterConfiguration {
private final int mTpid;
private TsFilterConfiguration(Settings settings, int tpid) {
@@ -63,8 +64,9 @@ public class TsFilterConfiguration extends FilterConfiguration {
/**
* Builder for {@link TsFilterConfiguration}.
*/
public static class Builder extends FilterConfiguration.Builder<Builder> {
public static final class Builder {
private int mTpid;
private Settings mSettings;
private Builder() {
}
@@ -80,6 +82,15 @@ public class TsFilterConfiguration extends FilterConfiguration {
return this;
}
/**
* Sets filter settings.
*/
@NonNull
public Builder setSettings(@Nullable Settings settings) {
mSettings = settings;
return this;
}
/**
* Builds a {@link TsFilterConfiguration} object.
*/
@@ -87,10 +98,5 @@ public class TsFilterConfiguration extends FilterConfiguration {
public TsFilterConfiguration build() {
return new TsFilterConfiguration(mSettings, mTpid);
}
@Override
Builder self() {
return this;
}
}
}