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

Commit b838fbf8 authored by shubang's avatar shubang
Browse files

Tuner API: remove @FilterConfiguration.PacketType 

There are some valid and reserved packet type values, so packet type
should not be enum.

According to specs
ITU-R BT.1869, https://screenshot.googleplex.com/HhktwijUqBF.png
ATSC A/330:2019,https://screenshot.googleplex.com/6ZQdO6HrmAS.png

Bug: 150639580
Test: mmm
Change-Id: Ie879a518635707dc71837fda12d90866faf35dc1
parent f71d1dc5

api/system-current.txt

+10 −3
Original line number Diff line number Diff line
@@ -5000,6 +5000,11 @@ package android.media.tv.tuner.filter { 
    field public static final int LENGTH_TYPE_UNDEFINED = 0; // 0x0

    field public static final int LENGTH_TYPE_WITHOUT_ADDITIONAL_HEADER = 1; // 0x1

    field public static final int LENGTH_TYPE_WITH_ADDITIONAL_HEADER = 2; // 0x2

    field public static final int PACKET_TYPE_COMPRESSED = 2; // 0x2

    field public static final int PACKET_TYPE_EXTENSION = 6; // 0x6

    field public static final int PACKET_TYPE_IPV4 = 0; // 0x0

    field public static final int PACKET_TYPE_MPEG2_TS = 7; // 0x7

    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> {










@@ -5090,9 +5095,6 @@ package android.media.tv.tuner.filter {













  public abstract class FilterConfiguration {















    method @Nullable public android.media.tv.tuner.filter.Settings getSettings();















    method public abstract int getType();













    field public static final int PACKET_TYPE_COMPRESSED = 2; // 0x2













    field public static final int PACKET_TYPE_IPV4 = 0; // 0x0













    field public static final int PACKET_TYPE_SIGNALING = 4; // 0x4















  }





























  public abstract static class FilterConfiguration.Builder<T extends android.media.tv.tuner.filter.FilterConfiguration.Builder<T>> {










@@ -5290,6 +5292,11 @@ package android.media.tv.tuner.filter {













    method public int getType();















    method public boolean isCompressedIpPacket();















    method public boolean isPassthrough();













    field public static final int PACKET_TYPE_COMPRESSED = 3; // 0x3













    field public static final int PACKET_TYPE_IPV4 = 1; // 0x1













    field public static final int PACKET_TYPE_IPV6 = 2; // 0x2













    field public static final int PACKET_TYPE_NULL = 255; // 0xff













    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> {

































media/java/android/media/tv/tuner/filter/AlpFilterConfiguration.java



+26
−2




























Original line number
Diff line number
Diff line








@@ -34,6 +34,27 @@ import java.lang.annotation.RetentionPolicy;













 */















@SystemApi















public class AlpFilterConfiguration extends FilterConfiguration {













    /**













     * IPv4 packet type.













     */













    public static final int PACKET_TYPE_IPV4 = 0;













    /**













     * Compressed packet type.













     */













    public static final int PACKET_TYPE_COMPRESSED = 2;













    /**













     * Signaling packet type.













     */













    public static final int PACKET_TYPE_SIGNALING = 4;













    /**













     * Extension packet type.













     */













    public static final int PACKET_TYPE_EXTENSION = 6;













    /**













     * MPEG-2 TS packet type.













     */













    public static final int PACKET_TYPE_MPEG2_TS = 7;





























    /** @hide */















    @Retention(RetentionPolicy.SOURCE)















    @IntDef(prefix = "LENGTH_TYPE_", value =










@@ -73,8 +94,9 @@ public class AlpFilterConfiguration extends FilterConfiguration {





























    /**















     * Gets packet type.













     *













     * <p>The meaning of each packet type value is shown in ATSC A/330:2019 table 5.2.















     */













    @FilterConfiguration.PacketType















    public int getPacketType() {















        return mPacketType;















    }










@@ -110,9 +132,11 @@ public class AlpFilterConfiguration extends FilterConfiguration {





























        /**















         * Sets packet type.













         *













         * <p>The meaning of each packet type value is shown in ATSC A/330:2019 table 5.2.















         */















        @NonNull













        public Builder setPacketType(@FilterConfiguration.PacketType int packetType) {













        public Builder setPacketType(int packetType) {















            mPacketType = packetType;















            return this;















        }

































media/java/android/media/tv/tuner/filter/FilterConfiguration.java



+0
−24




























Original line number
Diff line number
Diff line








@@ -16,14 +16,10 @@





























package android.media.tv.tuner.filter;





























import android.annotation.IntDef;















import android.annotation.NonNull;















import android.annotation.Nullable;















import android.annotation.SystemApi;





























import java.lang.annotation.Retention;













import java.lang.annotation.RetentionPolicy;





























/**















 * Filter configuration used to configure filters.















 *









@@ -32,26 +28,6 @@ import java.lang.annotation.RetentionPolicy;













@SystemApi















public abstract class FilterConfiguration {





























    /** @hide */













    @IntDef(prefix = "PACKET_TYPE_", value =













            {PACKET_TYPE_IPV4, PACKET_TYPE_COMPRESSED, PACKET_TYPE_SIGNALING})













    @Retention(RetentionPolicy.SOURCE)













    public @interface PacketType {}



























    /**













     * IP v4 packet type.













     */













    public static final int PACKET_TYPE_IPV4 = 0;













    /**













     * Compressed packet type.













     */













    public static final int PACKET_TYPE_COMPRESSED = 2;













    /**













     * Signaling packet type.













     */













    public static final int PACKET_TYPE_SIGNALING = 4;











































    @Nullable















    /* package */ final Settings mSettings;

















































media/java/android/media/tv/tuner/filter/TlvFilterConfiguration.java



+26
−2




























Original line number
Diff line number
Diff line








@@ -29,6 +29,27 @@ import android.media.tv.tuner.TunerUtils;













 */















@SystemApi















public class TlvFilterConfiguration extends FilterConfiguration {













    /**













     * IPv4 packet type.













     */













    public static final int PACKET_TYPE_IPV4 = 0x01;













    /**













     * IPv6 packet type.













     */













    public static final int PACKET_TYPE_IPV6 = 0x02;













    /**













     * Compressed packet type.













     */













    public static final int PACKET_TYPE_COMPRESSED = 0x03;













    /**













     * Signaling packet type.













     */













    public static final int PACKET_TYPE_SIGNALING = 0xFE;













    /**













     * NULL packet type.













     */













    public static final int PACKET_TYPE_NULL = 0xFF;





























    private final int mPacketType;















    private final boolean mIsCompressedIpPacket;















    private final boolean mPassthrough;









@@ -48,8 +69,9 @@ public class TlvFilterConfiguration extends FilterConfiguration {





























    /**















     * Gets packet type.













     *













     * <p>The description of each packet type value is shown in ITU-R BT.1869 table 2.















     */













    @FilterConfiguration.PacketType















    public int getPacketType() {















        return mPacketType;















    }










@@ -96,9 +118,11 @@ public class TlvFilterConfiguration extends FilterConfiguration {





























        /**















         * Sets packet type.













         *













         * <p>The description of each packet type value is shown in ITU-R BT.1869 table 2.















         */















        @NonNull













        public Builder setPacketType(@FilterConfiguration.PacketType int packetType) {













        public Builder setPacketType(int packetType) {















            mPacketType = packetType;















            return this;















        }