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

Commit df81d7b0 authored by sadiqsada's avatar sadiqsada Committed by Sadiq Sada
Browse files

Remove static builder method.

According to go/android-api-guidelines#builder-constructor,
builders cannot be created through static method and must
be created through non-static constructor instead.

Bug: 267312564
Test: atest android.media.tv.tuner.cts
Change-Id: I1b1035eecd80518158a5fc3e9e531d6a73106bcb
parent 5c6c5829
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -9115,8 +9115,7 @@ package android.media.tv.tuner.frontend {
    method public int getProtocolCapability();
  }
  public class IptvFrontendSettings extends android.media.tv.tuner.frontend.FrontendSettings {
    method @NonNull public static android.media.tv.tuner.frontend.IptvFrontendSettings.Builder builder();
  public final class IptvFrontendSettings extends android.media.tv.tuner.frontend.FrontendSettings {
    method @IntRange(from=0) public long getBitrate();
    method @NonNull public String getContentUrl();
    method @NonNull @Size(min=4, max=16) public byte[] getDstIpAddress();
@@ -9137,6 +9136,7 @@ package android.media.tv.tuner.frontend {
  }
  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.Builder setBitrate(@IntRange(from=0) long);
    method @NonNull public android.media.tv.tuner.frontend.IptvFrontendSettings.Builder setContentUrl(@NonNull String);
@@ -9149,8 +9149,7 @@ package android.media.tv.tuner.frontend {
    method @NonNull public android.media.tv.tuner.frontend.IptvFrontendSettings.Builder setSrcPort(int);
  }
  public class IptvFrontendSettingsFec {
    method @NonNull public static android.media.tv.tuner.frontend.IptvFrontendSettingsFec.Builder builder();
  public final class IptvFrontendSettingsFec {
    method @IntRange(from=0) public int getFecColNum();
    method @IntRange(from=0) public int getFecRowNum();
    method public int getFecType();
@@ -9161,6 +9160,7 @@ package android.media.tv.tuner.frontend {
  }
  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.Builder setFecColNum(@IntRange(from=0) int);
    method @NonNull public android.media.tv.tuner.frontend.IptvFrontendSettingsFec.Builder setFecRowNum(@IntRange(from=0) int);
+4 −12
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ import java.lang.annotation.RetentionPolicy;
 * @hide
 */
@SystemApi
public class IptvFrontendSettings extends FrontendSettings {
public final class IptvFrontendSettings extends FrontendSettings {
    /** @hide */
    @IntDef(prefix = "PROTOCOL_",
            value = {PROTOCOL_UNDEFINED, PROTOCOL_UDP, PROTOCOL_RTP})
@@ -180,14 +180,6 @@ public class IptvFrontendSettings extends FrontendSettings {
        return mContentUrl;
    }

    /**
     * Creates a builder for {@link IptvFrontendSettings}.
     */
    @NonNull
    public static Builder builder() {
        return new Builder();
    }

    /**
     * Builder for {@link IptvFrontendSettings}.
     */
@@ -202,7 +194,7 @@ public class IptvFrontendSettings extends FrontendSettings {
        private long mBitrate = 0;
        private String mContentUrl = "";

        private Builder() {
        public Builder() {
        }

        /**
@@ -309,8 +301,8 @@ public class IptvFrontendSettings extends FrontendSettings {
         */
        @NonNull
        public IptvFrontendSettings build() {
            return new IptvFrontendSettings(mSrcIpAddress, mDstIpAddress, mSrcPort,
                    mDstPort, mFec, mProtocol, mIgmp, mBitrate, mContentUrl);
            return new IptvFrontendSettings(mSrcIpAddress, mDstIpAddress, mSrcPort, mDstPort,
                    mFec, mProtocol, mIgmp, mBitrate, mContentUrl);
        }
    }

+2 −10
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ import java.lang.annotation.RetentionPolicy;
 * @hide
 */
@SystemApi
public class IptvFrontendSettingsFec {
public final class IptvFrontendSettingsFec {
    /** @hide */
    @IntDef(prefix = "FEC_TYPE_",
            value = {FEC_TYPE_UNDEFINED, FEC_TYPE_COLUMN, FEC_TYPE_ROW, FEC_TYPE_COLUMN_ROW})
@@ -92,14 +92,6 @@ public class IptvFrontendSettingsFec {
        return mFecColNum;
    }

    /**
     * Creates a builder for {@link IptvFrontendSettingsFec}.
     */
    @NonNull
    public static Builder builder() {
        return new Builder();
    }

    /**
     * Builder for {@link IptvFrontendSettingsFec}.
     */
@@ -108,7 +100,7 @@ public class IptvFrontendSettingsFec {
        private int mFecRowNum;
        private int mFecColNum;

        private Builder() {
        public Builder() {
        }

        /**