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

Commit df135cdd authored by Amy Zhang's avatar Amy Zhang
Browse files

Add some invalid constants for Tuner 

Test: make -j44 dist
Bug: 171866656
Change-Id: I057c70354b51efb8bb7a4473b0e76e3f0bbc3cf8
parent 8a0fc3a8

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -5092,7 +5092,9 @@ package android.media.tv.tuner { 
    field public static final int INVALID_FILTER_ID = -1; // 0xffffffff

    field public static final long INVALID_FILTER_ID_64BIT = -1L; // 0xffffffffffffffffL

    field public static final int INVALID_FIRST_MACROBLOCK_IN_SLICE = -1; // 0xffffffff

    field public static final int INVALID_FRONTEND_ID = -1; // 0xffffffff

    field public static final int INVALID_FRONTEND_SETTING_FREQUENCY = -1; // 0xffffffff

    field @NonNull public static final byte[] INVALID_KEYTOKEN;

    field public static final int INVALID_LTS_ID = -1; // 0xffffffff

    field public static final int INVALID_MMTP_RECORD_EVENT_MPT_SEQUENCE_NUM = -1; // 0xffffffff

    field public static final int INVALID_STREAM_ID = 65535; // 0xffff

core/api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -5032,7 +5032,9 @@ package android.media.tv.tuner { 
    field public static final int INVALID_FILTER_ID = -1; // 0xffffffff

    field public static final long INVALID_FILTER_ID_64BIT = -1L; // 0xffffffffffffffffL

    field public static final int INVALID_FIRST_MACROBLOCK_IN_SLICE = -1; // 0xffffffff

    field public static final int INVALID_FRONTEND_ID = -1; // 0xffffffff

    field public static final int INVALID_FRONTEND_SETTING_FREQUENCY = -1; // 0xffffffff

    field @NonNull public static final byte[] INVALID_KEYTOKEN;

    field public static final int INVALID_LTS_ID = -1; // 0xffffffff

    field public static final int INVALID_MMTP_RECORD_EVENT_MPT_SEQUENCE_NUM = -1; // 0xffffffff

    field public static final int INVALID_STREAM_ID = 65535; // 0xffff

media/java/android/media/tv/tuner/Descrambler.java

+5 −2
Original line number Diff line number Diff line
@@ -111,10 +111,13 @@ public class Descrambler implements AutoCloseable { 
    /**

     * Set a key token to link descrambler to a key slot

     *

     * A descrambler instance can have only one key slot to link, but a key slot can hold a few

     * <p>A descrambler instance can have only one key slot to link, but a key slot can hold a few

     * keys for different purposes.

     *

     * @param keyToken the token to be used to link the key slot.

     * @param keyToken the token to be used to link the key slot. Use {@link Tuner.INVALID_KEYTOKEN}

     *        to remove the to remove the current key from descrambler. If the current keyToken

     *        comes from MediaCas session, use {@link Tuner.INVALID_KEYTOKEN} to remove current key

     *        before close MediaCas session.

     * @return result status of the operation.

     */

    @Result

media/java/android/media/tv/tuner/Tuner.java

+21 −0
Original line number Diff line number Diff line
@@ -152,6 +152,27 @@ public class Tuner implements AutoCloseable { 
     */

    public static final int INVALID_FRONTEND_SETTING_FREQUENCY =

            android.hardware.tv.tuner.V1_1.Constants.Constant.INVALID_FRONTEND_SETTING_FREQUENCY;

    /**

     * Invalid frontend id.

     */

    public static final int INVALID_FRONTEND_ID =

            android.hardware.tv.tuner.V1_1.Constants.Constant.INVALID_FRONTEND_ID;

    /**

     * Invalid LNB id.

     *

     * @hide

     */

    public static final int INVALID_LNB_ID =

            android.hardware.tv.tuner.V1_1.Constants.Constant.INVALID_LNB_ID;

    /**

     * Invalid key token. It is used to remove the current key from descrambler.

     *

     * <p>If the current keyToken comes from a MediaCas session, App is recommended to

     * to use this constant to remove current key before closing MediaCas session.

     */

    @NonNull

    public static final byte[] INVALID_KEYTOKEN =

            {android.hardware.tv.tuner.V1_1.Constants.Constant.INVALID_KEYTOKEN};



    /** @hide */

    @IntDef(prefix = "SCAN_TYPE_", value = {SCAN_TYPE_UNDEFINED, SCAN_TYPE_AUTO, SCAN_TYPE_BLIND})

media/java/android/media/tv/tuner/frontend/FrontendInfo.java

+3 −0
Original line number Diff line number Diff line
@@ -53,6 +53,9 @@ public class FrontendInfo { 


    /**

     * Gets frontend ID.

     *

     * @return the frontend ID or {@link android.media.tv.tuner.Tuner.INVALID_FRONTEND_ID}

     *         if invalid

     */

    public int getId() {

        return mId;