TIF: Use more consistent constant names (6e62a150) · Commits · e / os / android_frameworks_base

api/current.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -16998,7 +16998,7 @@ package android.media.tv {
		field public static final int INPUT_STATE_CONNECTED_STANDBY = 1; // 0x1
		field public static final int INPUT_STATE_DISCONNECTED = 2; // 0x2
		field public static final int VIDEO_UNAVAILABLE_REASON_BUFFERING = 3; // 0x3
		field public static final int VIDEO_UNAVAILABLE_REASON_TUNE = 1; // 0x1
		field public static final int VIDEO_UNAVAILABLE_REASON_TUNING = 1; // 0x1
		field public static final int VIDEO_UNAVAILABLE_REASON_UNKNOWN = 0; // 0x0
		field public static final int VIDEO_UNAVAILABLE_REASON_WEAK_SIGNAL = 2; // 0x2
		}
		@@ -17121,8 +17121,8 @@ package android.media.tv {
		method public void setTvInputListener(android.media.tv.TvView.TvInputListener);
		method public void tune(java.lang.String, android.net.Uri);
		method public void unselectTrack(android.media.tv.TvTrackInfo);
		field public static final int ERROR_BUSY = 0; // 0x0
		field public static final int ERROR_TV_INPUT_DISCONNECTED = 1; // 0x1
		field public static final int ERROR_INPUT_DISCONNECTED = 1; // 0x1
		field public static final int ERROR_INPUT_NOT_CONNECTED = 0; // 0x0
		}

		public static abstract interface TvView.OnUnhandledInputEventListener {

media/java/android/media/tv/TvInputManager.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -57,9 +57,9 @@ public final class TvInputManager {
		*/
		public static final int VIDEO_UNAVAILABLE_REASON_UNKNOWN = VIDEO_UNAVAILABLE_REASON_START;
		/**
		* Video is not available because the TV input is tuning to another channel.
		* Video is not available because the TV input is in the middle of tuning to a new channel.
		*/
		public static final int VIDEO_UNAVAILABLE_REASON_TUNE = 1;
		public static final int VIDEO_UNAVAILABLE_REASON_TUNING = 1;
		/**
		* Video is not available due to the weak TV signal.
		*/
		@@ -180,7 +180,7 @@ public final class TvInputManager {
		* @param reason The reason why the TV input stopped the playback:
		* <ul>
		* <li>{@link TvInputManager#VIDEO_UNAVAILABLE_REASON_UNKNOWN}
		* <li>{@link TvInputManager#VIDEO_UNAVAILABLE_REASON_TUNE}
		* <li>{@link TvInputManager#VIDEO_UNAVAILABLE_REASON_TUNING}
		* <li>{@link TvInputManager#VIDEO_UNAVAILABLE_REASON_WEAK_SIGNAL}
		* <li>{@link TvInputManager#VIDEO_UNAVAILABLE_REASON_BUFFERING}
		* </ul>

media/java/android/media/tv/TvInputService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -367,7 +367,7 @@ public abstract class TvInputService extends Service {
		* @param reason The reason why the TV input stopped the playback:
		* <ul>
		* <li>{@link TvInputManager#VIDEO_UNAVAILABLE_REASON_UNKNOWN}
		* <li>{@link TvInputManager#VIDEO_UNAVAILABLE_REASON_TUNE}
		* <li>{@link TvInputManager#VIDEO_UNAVAILABLE_REASON_TUNING}
		* <li>{@link TvInputManager#VIDEO_UNAVAILABLE_REASON_WEAK_SIGNAL}
		* <li>{@link TvInputManager#VIDEO_UNAVAILABLE_REASON_BUFFERING}
		* </ul>

media/java/android/media/tv/TvView.java

+8 −7

Original line number	Diff line number	Diff line
		@@ -49,16 +49,17 @@ public class TvView extends ViewGroup {
		private static final boolean DEBUG = true;

		/**
		* Passed with {@link TvInputListener#onError(String, int)}. Indicates that the requested TV
		* input is busy and unable to handle the request.
		* Passed with {@link TvInputListener#onError(String, int)}. Indicates that the connection to
		* the requested TV input was not established thus the view is unable to handle the further
		* operations.
		*/
		public static final int ERROR_BUSY = 0;
		public static final int ERROR_INPUT_NOT_CONNECTED = 0;

		/**
		* Passed with {@link TvInputListener#onError(String, int)}. Indicates that the underlying TV
		* input has been disconnected.
		*/
		public static final int ERROR_TV_INPUT_DISCONNECTED = 1;
		public static final int ERROR_INPUT_DISCONNECTED = 1;

		private static final int VIDEO_SIZE_VALUE_UNKNOWN = 0;

		@@ -632,7 +633,7 @@ public class TvView extends ViewGroup {
		* @param reason The reason why the TV input stopped the playback:
		* <ul>
		* <li>{@link TvInputManager#VIDEO_UNAVAILABLE_REASON_UNKNOWN}
		* <li>{@link TvInputManager#VIDEO_UNAVAILABLE_REASON_TUNE}
		* <li>{@link TvInputManager#VIDEO_UNAVAILABLE_REASON_TUNING}
		* <li>{@link TvInputManager#VIDEO_UNAVAILABLE_REASON_WEAK_SIGNAL}
		* <li>{@link TvInputManager#VIDEO_UNAVAILABLE_REASON_BUFFERING}
		* </ul>
		@@ -729,7 +730,7 @@ public class TvView extends ViewGroup {
		}
		} else {
		if (mListener != null) {
		mListener.onError(mInputId, ERROR_BUSY);
		mListener.onError(mInputId, ERROR_INPUT_NOT_CONNECTED);
		}
		}
		}
		@@ -742,7 +743,7 @@ public class TvView extends ViewGroup {
		mSessionCallback = null;
		mSession = null;
		if (mListener != null) {
		mListener.onError(mInputId, ERROR_TV_INPUT_DISCONNECTED);
		mListener.onError(mInputId, ERROR_INPUT_DISCONNECTED);
		}
		}