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

Commit 49ac644d authored by Amy Zhang's avatar Amy Zhang
Browse files

Rename setDiseqcRxMessage to setShouldReceiveDiseqcMessage to explain 

the usage in a better way

Test: make -j44 dist
Bug: 171314799
Change-Id: I6bead9d628bb47227f4168943ee412fe7d8e7752
parent 6e59ac63

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -5871,6 +5871,7 @@ package android.media.tv.tuner.frontend { 
  public class DvbsFrontendSettings extends android.media.tv.tuner.frontend.FrontendSettings {

    method @NonNull public static android.media.tv.tuner.frontend.DvbsFrontendSettings.Builder builder();

    method @Nullable public android.media.tv.tuner.frontend.DvbsCodeRate getCodeRate();

    method public boolean getCouldHandleDiseqcRxMessage();

    method public int getInputStreamId();

    method public int getModulation();

    method public int getPilot();
@@ -5880,7 +5881,6 @@ package android.media.tv.tuner.frontend { 
    method public int getSymbolRate();

    method public int getType();

    method public int getVcmMode();

    method public boolean isDiseqcRxMessage();

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

    field public static final int MODULATION_MOD_128APSK = 2048; // 0x800

    field public static final int MODULATION_MOD_16APSK = 256; // 0x100
@@ -5924,7 +5924,7 @@ package android.media.tv.tuner.frontend { 
  public static class DvbsFrontendSettings.Builder {

    method @NonNull public android.media.tv.tuner.frontend.DvbsFrontendSettings build();

    method @NonNull public android.media.tv.tuner.frontend.DvbsFrontendSettings.Builder setCodeRate(@Nullable android.media.tv.tuner.frontend.DvbsCodeRate);

    method @NonNull public android.media.tv.tuner.frontend.DvbsFrontendSettings.Builder setDiseqcRxMessage(boolean);

    method @NonNull public android.media.tv.tuner.frontend.DvbsFrontendSettings.Builder setCouldHandleDiseqcRxMessage(boolean);

    method @IntRange(from=1) @NonNull public android.media.tv.tuner.frontend.DvbsFrontendSettings.Builder setFrequency(int);

    method @NonNull public android.media.tv.tuner.frontend.DvbsFrontendSettings.Builder setInputStreamId(int);

    method @NonNull public android.media.tv.tuner.frontend.DvbsFrontendSettings.Builder setModulation(int);

core/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -5811,6 +5811,7 @@ package android.media.tv.tuner.frontend { 
  public class DvbsFrontendSettings extends android.media.tv.tuner.frontend.FrontendSettings {

    method @NonNull public static android.media.tv.tuner.frontend.DvbsFrontendSettings.Builder builder();

    method @Nullable public android.media.tv.tuner.frontend.DvbsCodeRate getCodeRate();

    method public boolean getCouldHandleDiseqcRxMessage();

    method public int getInputStreamId();

    method public int getModulation();

    method public int getPilot();
@@ -5820,7 +5821,6 @@ package android.media.tv.tuner.frontend { 
    method public int getSymbolRate();

    method public int getType();

    method public int getVcmMode();

    method public boolean isDiseqcRxMessage();

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

    field public static final int MODULATION_MOD_128APSK = 2048; // 0x800

    field public static final int MODULATION_MOD_16APSK = 256; // 0x100
@@ -5864,7 +5864,7 @@ package android.media.tv.tuner.frontend { 
  public static class DvbsFrontendSettings.Builder {

    method @NonNull public android.media.tv.tuner.frontend.DvbsFrontendSettings build();

    method @NonNull public android.media.tv.tuner.frontend.DvbsFrontendSettings.Builder setCodeRate(@Nullable android.media.tv.tuner.frontend.DvbsCodeRate);

    method @NonNull public android.media.tv.tuner.frontend.DvbsFrontendSettings.Builder setDiseqcRxMessage(boolean);

    method @NonNull public android.media.tv.tuner.frontend.DvbsFrontendSettings.Builder setCouldHandleDiseqcRxMessage(boolean);

    method @IntRange(from=1) @NonNull public android.media.tv.tuner.frontend.DvbsFrontendSettings.Builder setFrequency(int);

    method @NonNull public android.media.tv.tuner.frontend.DvbsFrontendSettings.Builder setInputStreamId(int);

    method @NonNull public android.media.tv.tuner.frontend.DvbsFrontendSettings.Builder setModulation(int);

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

+11 −8
Original line number Diff line number Diff line
@@ -341,12 +341,13 @@ public class DvbsFrontendSettings extends FrontendSettings { 
        return mScanType;

    }

    /**

     * To receive Diseqc Message or not. Default value is false.

     * Get if the client could handle the Diseqc Rx Message or not. Default value is false.

     *

     * The setter {@link Builder#setDiseqcRxMessage(boolean)} is only supported with Tuner HAL 1.1

     * or higher.

     * The setter {@link Builder#setCouldHandleDiseqcRxMessage(boolean)} is only supported with

     * Tuner HAL 1.1 or higher. Use {@link TunerVersionChecker.getTunerVersion()} to check the

     * version.

     */

    public boolean isDiseqcRxMessage() {

    public boolean getCouldHandleDiseqcRxMessage() {

        return mIsDiseqcRxMessage;

    }
@@ -408,16 +409,18 @@ public class DvbsFrontendSettings extends FrontendSettings { 
        }



        /**

         * Set true to receive Diseqc Message.

         * Set true to indicate the client could handle the Diseqc Messages. Note that it's still

         * possible that the client won't receive the messages when HAL is not able to setup Rx

         * channel in the hardware layer.

         *

         * <p>This API is only supported by Tuner HAL 1.1 or higher. Unsupported version would cause

         * no-op. Use {@link TunerVersionChecker.getTunerVersion()} to check the version.

         */

        @NonNull

        public Builder setDiseqcRxMessage(boolean isDiseqcRxMessage) {

        public Builder setCouldHandleDiseqcRxMessage(boolean couldReceiveDiseqcMessage) {

            if (TunerVersionChecker.checkHigherOrEqualVersionTo(

                        TunerVersionChecker.TUNER_VERSION_1_1, "setDiseqcRxMessage")) {

                mIsDiseqcRxMessage = isDiseqcRxMessage;

                        TunerVersionChecker.TUNER_VERSION_1_1, "setCouldHandleDiseqcRxMessage")) {

                mIsDiseqcRxMessage = couldReceiveDiseqcMessage;

            }

            return this;

        }