Merge "Unhide LNB methods and constants" (89f78f9a) · Commits · e / os / android_frameworks_base

api/system-current.txt

+29 −0

Original line number	Original line	Diff line number	Diff line
	@@ -4618,6 +4618,28 @@ package android.media.tv.tuner {
	method public abstract int getType();		method public abstract int getType();
	}		}

			public class Lnb implements java.lang.AutoCloseable {
			method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public void close();
			method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public int sendDiseqcMessage(@NonNull byte[]);
			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 POSITION_A = 1; // 0x1
			field public static final int POSITION_B = 2; // 0x2
			field public static final int POSITION_UNDEFINED = 0; // 0x0
			field public static final int TONE_CONTINUOUS = 1; // 0x1
			field public static final int TONE_NONE = 0; // 0x0
			field public static final int VOLTAGE_11V = 2; // 0x2
			field public static final int VOLTAGE_12V = 3; // 0x3
			field public static final int VOLTAGE_13V = 4; // 0x4
			field public static final int VOLTAGE_14V = 5; // 0x5
			field public static final int VOLTAGE_15V = 6; // 0x6
			field public static final int VOLTAGE_18V = 7; // 0x7
			field public static final int VOLTAGE_19V = 8; // 0x8
			field public static final int VOLTAGE_5V = 1; // 0x1
			field public static final int VOLTAGE_NONE = 0; // 0x0
			}

	public final class Tuner implements java.lang.AutoCloseable {		public final class Tuner implements java.lang.AutoCloseable {
	ctor public Tuner(@NonNull android.content.Context);		ctor public Tuner(@NonNull android.content.Context);
	method @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public android.media.tv.tuner.Tuner.Descrambler openDescrambler();		method @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public android.media.tv.tuner.Tuner.Descrambler openDescrambler();
	@@ -4640,6 +4662,13 @@ package android.media.tv.tuner {
	field public static final int FILTER_STATUS_HIGH_WATER = 4; // 0x4		field public static final int FILTER_STATUS_HIGH_WATER = 4; // 0x4
	field public static final int FILTER_STATUS_LOW_WATER = 2; // 0x2		field public static final int FILTER_STATUS_LOW_WATER = 2; // 0x2
	field public static final int FILTER_STATUS_OVERFLOW = 8; // 0x8		field public static final int FILTER_STATUS_OVERFLOW = 8; // 0x8
			field public static final int RESULT_INVALID_ARGUMENT = 4; // 0x4
			field public static final int RESULT_INVALID_STATE = 3; // 0x3
			field public static final int RESULT_NOT_INITIALIZED = 2; // 0x2
			field public static final int RESULT_OUT_OF_MEMORY = 5; // 0x5
			field public static final int RESULT_SUCCESS = 0; // 0x0
			field public static final int RESULT_UNAVAILABLE = 1; // 0x1
			field public static final int RESULT_UNKNOWN_ERROR = 6; // 0x6
	}		}

	}		}

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

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,7 @@ import android.annotation.IntDef;
	import android.annotation.NonNull;		import android.annotation.NonNull;
	import android.annotation.Nullable;		import android.annotation.Nullable;
	import android.annotation.RequiresPermission;		import android.annotation.RequiresPermission;
			import android.annotation.SystemApi;
	import android.content.Context;		import android.content.Context;
	import android.hardware.tv.tuner.V1_0.Constants;		import android.hardware.tv.tuner.V1_0.Constants;
	import android.media.tv.tuner.Tuner.LnbCallback;		import android.media.tv.tuner.Tuner.LnbCallback;
	@@ -37,6 +38,7 @@ import java.lang.annotation.RetentionPolicy;
	*		*
	* @hide		* @hide
	*/		*/
			@SystemApi
	public class Lnb implements AutoCloseable {		public class Lnb implements AutoCloseable {
	/** @hide */		/** @hide */
	@IntDef({VOLTAGE_NONE, VOLTAGE_5V, VOLTAGE_11V, VOLTAGE_12V, VOLTAGE_13V, VOLTAGE_14V,		@IntDef({VOLTAGE_NONE, VOLTAGE_5V, VOLTAGE_11V, VOLTAGE_12V, VOLTAGE_13V, VOLTAGE_14V,

media/java/android/media/tv/tuner/TunerConstants.java

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -1298,37 +1298,30 @@ public final class TunerConstants {

	/**		/**
	* Operation succeeded.		* Operation succeeded.
	* @hide
	*/		*/
	public static final int RESULT_SUCCESS = Constants.Result.SUCCESS;		public static final int RESULT_SUCCESS = Constants.Result.SUCCESS;
	/**		/**
	* Operation failed because the corresponding resources are not available.		* Operation failed because the corresponding resources are not available.
	* @hide
	*/		*/
	public static final int RESULT_UNAVAILABLE = Constants.Result.UNAVAILABLE;		public static final int RESULT_UNAVAILABLE = Constants.Result.UNAVAILABLE;
	/**		/**
	* Operation failed because the corresponding resources are not initialized.		* Operation failed because the corresponding resources are not initialized.
	* @hide
	*/		*/
	public static final int RESULT_NOT_INITIALIZED = Constants.Result.NOT_INITIALIZED;		public static final int RESULT_NOT_INITIALIZED = Constants.Result.NOT_INITIALIZED;
	/**		/**
	* Operation failed because it's not in a valid state.		* Operation failed because it's not in a valid state.
	* @hide
	*/		*/
	public static final int RESULT_INVALID_STATE = Constants.Result.INVALID_STATE;		public static final int RESULT_INVALID_STATE = Constants.Result.INVALID_STATE;
	/**		/**
	* Operation failed because there are invalid arguments.		* Operation failed because there are invalid arguments.
	* @hide
	*/		*/
	public static final int RESULT_INVALID_ARGUMENT = Constants.Result.INVALID_ARGUMENT;		public static final int RESULT_INVALID_ARGUMENT = Constants.Result.INVALID_ARGUMENT;
	/**		/**
	* Memory allocation failed.		* Memory allocation failed.
	* @hide
	*/		*/
	public static final int RESULT_OUT_OF_MEMORY = Constants.Result.OUT_OF_MEMORY;		public static final int RESULT_OUT_OF_MEMORY = Constants.Result.OUT_OF_MEMORY;
	/**		/**
	* Operation failed due to unknown errors.		* Operation failed due to unknown errors.
	* @hide
	*/		*/
	public static final int RESULT_UNKNOWN_ERROR = Constants.Result.UNKNOWN_ERROR;		public static final int RESULT_UNKNOWN_ERROR = Constants.Result.UNKNOWN_ERROR;