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

Merge "Remove static builder method." into udc-dev

Browse Source
This commit is contained in:
Sadiq Sada
2023-03-02 21:44:01 +00:00
committed by Android (Google) Code Review
parent d54c041918 df81d7b0f5
commit fe4042ba55
3 changed files with 10 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/api/system-current.txt
View File

@@ -9123,8 +9123,7 @@ package android.media.tv.tuner.frontend {
method public int getProtocolCapability(); method public int getProtocolCapability();
} }
public class IptvFrontendSettings extends android.media.tv.tuner.frontend.FrontendSettings { public final class IptvFrontendSettings extends android.media.tv.tuner.frontend.FrontendSettings {
method @NonNull public static android.media.tv.tuner.frontend.IptvFrontendSettings.Builder builder();
method @IntRange(from=0) public long getBitrate(); method @IntRange(from=0) public long getBitrate();
method @NonNull public String getContentUrl(); method @NonNull public String getContentUrl();
method @NonNull @Size(min=4, max=16) public byte[] getDstIpAddress(); method @NonNull @Size(min=4, max=16) public byte[] getDstIpAddress();
@@ -9145,6 +9144,7 @@ package android.media.tv.tuner.frontend {
} }
public static final class IptvFrontendSettings.Builder { public static final class IptvFrontendSettings.Builder {
ctor public IptvFrontendSettings.Builder();
method @NonNull public android.media.tv.tuner.frontend.IptvFrontendSettings build(); method @NonNull public android.media.tv.tuner.frontend.IptvFrontendSettings build();
method @NonNull public android.media.tv.tuner.frontend.IptvFrontendSettings.Builder setBitrate(@IntRange(from=0) long); method @NonNull public android.media.tv.tuner.frontend.IptvFrontendSettings.Builder setBitrate(@IntRange(from=0) long);
method @NonNull public android.media.tv.tuner.frontend.IptvFrontendSettings.Builder setContentUrl(@NonNull String); method @NonNull public android.media.tv.tuner.frontend.IptvFrontendSettings.Builder setContentUrl(@NonNull String);
@@ -9157,8 +9157,7 @@ package android.media.tv.tuner.frontend {
method @NonNull public android.media.tv.tuner.frontend.IptvFrontendSettings.Builder setSrcPort(int); method @NonNull public android.media.tv.tuner.frontend.IptvFrontendSettings.Builder setSrcPort(int);
} }
public class IptvFrontendSettingsFec { public final class IptvFrontendSettingsFec {
method @NonNull public static android.media.tv.tuner.frontend.IptvFrontendSettingsFec.Builder builder();
method @IntRange(from=0) public int getFecColNum(); method @IntRange(from=0) public int getFecColNum();
method @IntRange(from=0) public int getFecRowNum(); method @IntRange(from=0) public int getFecRowNum();
method public int getFecType(); method public int getFecType();
@@ -9169,6 +9168,7 @@ package android.media.tv.tuner.frontend {
} }
public static final class IptvFrontendSettingsFec.Builder { public static final class IptvFrontendSettingsFec.Builder {
ctor public IptvFrontendSettingsFec.Builder();
method @NonNull public android.media.tv.tuner.frontend.IptvFrontendSettingsFec build(); method @NonNull public android.media.tv.tuner.frontend.IptvFrontendSettingsFec build();
method @NonNull public android.media.tv.tuner.frontend.IptvFrontendSettingsFec.Builder setFecColNum(@IntRange(from=0) int); method @NonNull public android.media.tv.tuner.frontend.IptvFrontendSettingsFec.Builder setFecColNum(@IntRange(from=0) int);
method @NonNull public android.media.tv.tuner.frontend.IptvFrontendSettingsFec.Builder setFecRowNum(@IntRange(from=0) int); method @NonNull public android.media.tv.tuner.frontend.IptvFrontendSettingsFec.Builder setFecRowNum(@IntRange(from=0) int);

16
media/java/android/media/tv/tuner/frontend/IptvFrontendSettings.java
View File

@@ -34,7 +34,7 @@ import java.lang.annotation.RetentionPolicy;
* @hide * @hide
*/ */
@SystemApi @SystemApi
public class IptvFrontendSettings extends FrontendSettings { public final class IptvFrontendSettings extends FrontendSettings {
/** @hide */ /** @hide */
@IntDef(prefix = "PROTOCOL_", @IntDef(prefix = "PROTOCOL_",
value = {PROTOCOL_UNDEFINED, PROTOCOL_UDP, PROTOCOL_RTP}) value = {PROTOCOL_UNDEFINED, PROTOCOL_UDP, PROTOCOL_RTP})
@@ -180,14 +180,6 @@ public class IptvFrontendSettings extends FrontendSettings {
return mContentUrl; return mContentUrl;
} }
/**
* Creates a builder for {@link IptvFrontendSettings}.
*/
@NonNull
public static Builder builder() {
return new Builder();
}
/** /**
* Builder for {@link IptvFrontendSettings}. * Builder for {@link IptvFrontendSettings}.
*/ */
@@ -202,7 +194,7 @@ public class IptvFrontendSettings extends FrontendSettings {
private long mBitrate = 0; private long mBitrate = 0;
private String mContentUrl = ""; private String mContentUrl = "";
private Builder() { public Builder() {
} }
/** /**
@@ -309,8 +301,8 @@ public class IptvFrontendSettings extends FrontendSettings {
*/ */
@NonNull @NonNull
public IptvFrontendSettings build() { public IptvFrontendSettings build() {
return new IptvFrontendSettings(mSrcIpAddress, mDstIpAddress, mSrcPort, return new IptvFrontendSettings(mSrcIpAddress, mDstIpAddress, mSrcPort, mDstPort,
mDstPort, mFec, mProtocol, mIgmp, mBitrate, mContentUrl); mFec, mProtocol, mIgmp, mBitrate, mContentUrl);
} }
} }

12
media/java/android/media/tv/tuner/frontend/IptvFrontendSettingsFec.java
View File

@@ -31,7 +31,7 @@ import java.lang.annotation.RetentionPolicy;
* @hide * @hide
*/ */
@SystemApi @SystemApi
public class IptvFrontendSettingsFec { public final class IptvFrontendSettingsFec {
/** @hide */ /** @hide */
@IntDef(prefix = "FEC_TYPE_", @IntDef(prefix = "FEC_TYPE_",
value = {FEC_TYPE_UNDEFINED, FEC_TYPE_COLUMN, FEC_TYPE_ROW, FEC_TYPE_COLUMN_ROW}) value = {FEC_TYPE_UNDEFINED, FEC_TYPE_COLUMN, FEC_TYPE_ROW, FEC_TYPE_COLUMN_ROW})
@@ -92,14 +92,6 @@ public class IptvFrontendSettingsFec {
return mFecColNum; return mFecColNum;
} }
/**
* Creates a builder for {@link IptvFrontendSettingsFec}.
*/
@NonNull
public static Builder builder() {
return new Builder();
}
/** /**
* Builder for {@link IptvFrontendSettingsFec}. * Builder for {@link IptvFrontendSettingsFec}.
*/ */
@@ -108,7 +100,7 @@ public class IptvFrontendSettingsFec {
private int mFecRowNum; private int mFecRowNum;
private int mFecColNum; private int mFecColNum;
private Builder() { public Builder() {
} }
/** /**