Merge "Rename couldHandleDiseqcRxMessage to canHandleDiseqcRxMessage" (e0baa920) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -5912,8 +5912,8 @@ 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 public boolean canHandleDiseqcRxMessage();
		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();
		@@ -5965,8 +5965,8 @@ 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 setCanHandleDiseqcRxMessage(boolean);
		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 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

+7 −7

Original line number	Diff line number	Diff line
		@@ -341,13 +341,13 @@ public class DvbsFrontendSettings extends FrontendSettings {
		return mScanType;
		}
		/**
		* Get if the client could handle the Diseqc Rx Message or not. Default value is false.
		* Get if the client can handle the Diseqc Rx Message or not. Default value is false.
		*
		* The setter {@link Builder#setCouldHandleDiseqcRxMessage(boolean)} is only supported with
		* The setter {@link Builder#setCanHandleDiseqcRxMessage(boolean)} is only supported with
		* Tuner HAL 1.1 or higher. Use {@link TunerVersionChecker.getTunerVersion()} to check the
		* version.
		*/
		public boolean getCouldHandleDiseqcRxMessage() {
		public boolean canHandleDiseqcRxMessage() {
		return mIsDiseqcRxMessage;
		}

		@@ -409,7 +409,7 @@ public class DvbsFrontendSettings extends FrontendSettings {
		}

		/**
		* Set true to indicate the client could handle the Diseqc Messages. Note that it's still
		* Set true to indicate the client can 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.
		*
		@@ -417,10 +417,10 @@ public class DvbsFrontendSettings extends FrontendSettings {
		* no-op. Use {@link TunerVersionChecker.getTunerVersion()} to check the version.
		*/
		@NonNull
		public Builder setCouldHandleDiseqcRxMessage(boolean couldReceiveDiseqcMessage) {
		public Builder setCanHandleDiseqcRxMessage(boolean canHandleDiseqcMessage) {
		if (TunerVersionChecker.checkHigherOrEqualVersionTo(
		TunerVersionChecker.TUNER_VERSION_1_1, "setCouldHandleDiseqcRxMessage")) {
		mIsDiseqcRxMessage = couldReceiveDiseqcMessage;
		TunerVersionChecker.TUNER_VERSION_1_1, "setCanHandleDiseqcRxMessage")) {
		mIsDiseqcRxMessage = canHandleDiseqcMessage;
		}
		return this;
		}