Merge "Mark LnbCallback @SystemApi" (c33182c3) · Commits · e / os / android_frameworks_base

api/system-current.txt

+11 −0

Original line number	Diff line number	Diff line
		@@ -4689,6 +4689,10 @@ package android.media.tv.tuner {
		method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public int setSatellitePosition(int);
		method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public int setTone(int);
		method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public int setVoltage(int);
		field public static final int EVENT_TYPE_DISEQC_RX_OVERFLOW = 0; // 0x0
		field public static final int EVENT_TYPE_DISEQC_RX_PARITY_ERROR = 2; // 0x2
		field public static final int EVENT_TYPE_DISEQC_RX_TIMEOUT = 1; // 0x1
		field public static final int EVENT_TYPE_LNB_OVERLOAD = 3; // 0x3
		field public static final int POSITION_A = 1; // 0x1
		field public static final int POSITION_B = 2; // 0x2
		field public static final int POSITION_UNDEFINED = 0; // 0x0
		@@ -4705,6 +4709,11 @@ package android.media.tv.tuner {
		field public static final int VOLTAGE_NONE = 0; // 0x0
		}

		public interface LnbCallback {
		method public void onDiseqcMessage(@NonNull byte[]);
		method public void onEvent(int);
		}

		public final class Tuner implements java.lang.AutoCloseable {
		ctor public Tuner(@NonNull android.content.Context);
		method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public void clearOnTuneEventListener();
		@@ -4712,6 +4721,8 @@ package android.media.tv.tuner {
		method @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public android.media.tv.tuner.dvr.DvrPlayback openDvrPlayback(long, @Nullable java.util.concurrent.Executor, @Nullable android.media.tv.tuner.dvr.OnPlaybackStatusChangedListener);
		method @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public android.media.tv.tuner.dvr.DvrRecorder openDvrRecorder(long, @Nullable java.util.concurrent.Executor, @Nullable android.media.tv.tuner.dvr.OnRecordStatusChangedListener);
		method @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public android.media.tv.tuner.filter.Filter openFilter(int, int, long, @Nullable java.util.concurrent.Executor, @Nullable android.media.tv.tuner.filter.FilterCallback);
		method @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public android.media.tv.tuner.Lnb openLnb(@Nullable java.util.concurrent.Executor, @Nullable android.media.tv.tuner.LnbCallback);
		method @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public android.media.tv.tuner.Lnb openLnbByName(@Nullable String, @Nullable java.util.concurrent.Executor, @NonNull android.media.tv.tuner.LnbCallback);
		method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public void setOnTuneEventListener(@NonNull java.util.concurrent.Executor, @NonNull android.media.tv.tuner.frontend.OnTuneEventListener);
		method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public int stopTune();
		method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public int tune(@NonNull android.media.tv.tuner.frontend.FrontendSettings);

media/java/android/media/tv/tuner/Lnb.java

+1 −6

Original line number	Diff line number	Diff line
		@@ -126,25 +126,21 @@ public class Lnb implements AutoCloseable {

		/**
		* Outgoing Diseqc message overflow.
		* @hide
		*/
		public static final int EVENT_TYPE_DISEQC_RX_OVERFLOW =
		Constants.LnbEventType.DISEQC_RX_OVERFLOW;
		/**
		* Outgoing Diseqc message isn't delivered on time.
		* @hide
		*/
		public static final int EVENT_TYPE_DISEQC_RX_TIMEOUT =
		Constants.LnbEventType.DISEQC_RX_TIMEOUT;
		/**
		* Incoming Diseqc message has parity error.
		* @hide
		*/
		public static final int EVENT_TYPE_DISEQC_RX_PARITY_ERROR =
		Constants.LnbEventType.DISEQC_RX_PARITY_ERROR;
		/**
		* LNB is overload.
		* @hide
		*/
		public static final int EVENT_TYPE_LNB_OVERLOAD = Constants.LnbEventType.LNB_OVERLOAD;

		@@ -162,8 +158,7 @@ public class Lnb implements AutoCloseable {
		mId = id;
		}

		/** @hide */
		public void setCallback(@Nullable LnbCallback callback) {
		void setCallback(@Nullable LnbCallback callback) {
		mCallback = callback;
		if (mCallback == null) {
		return;

media/java/android/media/tv/tuner/LnbCallback.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,8 @@
		package android.media.tv.tuner;


		import android.annotation.NonNull;
		import android.annotation.SystemApi;
		import android.media.tv.tuner.Lnb.EventType;

		/**
		@@ -24,6 +26,7 @@ import android.media.tv.tuner.Lnb.EventType;
		*
		* @hide
		*/
		@SystemApi
		public interface LnbCallback {
		/**
		* Invoked when there is a LNB event.
		@@ -37,5 +40,5 @@ public interface LnbCallback {
		* Equipment Control) message which is specified by EUTELSAT Bus Functional
		* Specification Version 4.2.
		*/
		void onDiseqcMessage(byte[] diseqcMessage);
		void onDiseqcMessage(@NonNull byte[] diseqcMessage);
		}

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

+3 −6

Original line number	Diff line number	Diff line
		@@ -564,12 +564,11 @@ public final class Tuner implements AutoCloseable {
		* executor is used if it's {@code null}.
		* @param cb the callback to receive notifications from LNB.
		* @return the opened LNB object. {@code null} if the operation failed.
		*
		* @hide
		*/
		@RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER)
		@Nullable
		public Lnb openLnb(@CallbackExecutor @Nullable Executor executor, LnbCallback cb) {
		public Lnb openLnb(@CallbackExecutor @Nullable Executor executor, @Nullable LnbCallback cb) {
		TunerUtils.checkTunerPermission(mContext);
		return openLnbByName(null, executor, cb);
		}

		@@ -581,13 +580,11 @@ public final class Tuner implements AutoCloseable {
		* executor is used if it's {@code null}.
		* @param cb the callback to receive notifications from LNB.
		* @return the opened LNB object. {@code null} if the operation failed.
		*
		* @hide
		*/
		@RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER)
		@Nullable
		public Lnb openLnbByName(@Nullable String name, @CallbackExecutor @Nullable Executor executor,
		LnbCallback cb) {
		@NonNull LnbCallback cb) {
		TunerUtils.checkTunerPermission(mContext);
		// TODO: use resource manager to get LNB ID.
		return new Lnb(0);