TIF: Use more consistent constant names

Change-Id: Iee7cbbba621e4174c9fdaedc86d3830ca9f46cfe

3 files changed, 12 insertions, 11 deletions

diff --git a/media/java/android/media/tv/TvInputManager.java b/media/java/android/media/tv/TvInputManager.java
index 4bb0c53..e5c2f76 100644
--- a/media/java/android/media/tv/TvInputManager.java
+++ b/media/java/android/media/tv/TvInputManager.java
@@ -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>
diff --git a/media/java/android/media/tv/TvInputService.java b/media/java/android/media/tv/TvInputService.java
index 6b0a633..75271d0 100644
--- a/media/java/android/media/tv/TvInputService.java
+++ b/media/java/android/media/tv/TvInputService.java
@@ -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>
diff --git a/media/java/android/media/tv/TvView.java b/media/java/android/media/tv/TvView.java
index a5eef0a..f6af8c8 100644
--- a/media/java/android/media/tv/TvView.java
+++ b/media/java/android/media/tv/TvView.java
@@ -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);
             }
         }