diff options
| -rw-r--r-- | api/system-current.txt | 4 | ||||
| -rw-r--r-- | core/api/system-current.txt | 4 | ||||
| -rw-r--r-- | media/java/android/media/tv/tuner/frontend/DvbsFrontendSettings.java | 19 |
3 files changed, 15 insertions, 12 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 8f5df9d18221..115b4d88857f 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5886,6 +5886,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(); @@ -5895,7 +5896,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 @@ -5939,7 +5939,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); diff --git a/core/api/system-current.txt b/core/api/system-current.txt index eb482a7bd877..1e3a2c04f1f5 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -5826,6 +5826,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(); @@ -5835,7 +5836,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 @@ -5879,7 +5879,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); diff --git a/media/java/android/media/tv/tuner/frontend/DvbsFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/DvbsFrontendSettings.java index fadc00475930..98f80965523f 100644 --- a/media/java/android/media/tv/tuner/frontend/DvbsFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/DvbsFrontendSettings.java @@ -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; } |