Merge "TIF: Change invalid error code to RECORDING_ERROR_UNKNOWN" into nyc-dev
diff --git a/media/java/android/media/tv/TvInputManager.java b/media/java/android/media/tv/TvInputManager.java
index 1d894e1..22bb5f1 100644
--- a/media/java/android/media/tv/TvInputManager.java
+++ b/media/java/android/media/tv/TvInputManager.java
@@ -188,6 +188,9 @@
RECORDING_ERROR_RESOURCE_BUSY})
public @interface RecordingError {}
+ static final int RECORDING_ERROR_START = 0;
+ static final int RECORDING_ERROR_END = 2;
+
/**
* Error for {@link TvInputService.RecordingSession#notifyError(int)} and
* {@link TvRecordingClient.RecordingCallback#onError(int)}: The requested operation cannot be
@@ -195,7 +198,7 @@
* for the problem is defined on the higher version than application's
* <code>android:targetSdkVersion</code>.
*/
- public static final int RECORDING_ERROR_UNKNOWN = 0;
+ public static final int RECORDING_ERROR_UNKNOWN = RECORDING_ERROR_START;
/**
* Error for {@link TvInputService.RecordingSession#notifyError(int)} and
@@ -209,7 +212,7 @@
* {@link TvRecordingClient.RecordingCallback#onError(int)}: Recording cannot proceed because
* a required recording resource was not able to be allocated.
*/
- public static final int RECORDING_ERROR_RESOURCE_BUSY = 2;
+ public static final int RECORDING_ERROR_RESOURCE_BUSY = RECORDING_ERROR_END;
/** @hide */
@Retention(RetentionPolicy.SOURCE)
diff --git a/media/java/android/media/tv/TvInputService.java b/media/java/android/media/tv/TvInputService.java
index 488b284..168fcdc 100644
--- a/media/java/android/media/tv/TvInputService.java
+++ b/media/java/android/media/tv/TvInputService.java
@@ -1613,7 +1613,14 @@
* <li>{@link TvInputManager#RECORDING_ERROR_RESOURCE_BUSY}
* </ul>
*/
- public void notifyError(@TvInputManager.RecordingError final int error) {
+ public void notifyError(@TvInputManager.RecordingError int error) {
+ if (error < TvInputManager.RECORDING_ERROR_START
+ || error > TvInputManager.RECORDING_ERROR_END) {
+ Log.w(TAG, "notifyError - invalid error code (" + error
+ + ") is changed to RECORDING_ERROR_UNKNOWN.");
+ error = TvInputManager.RECORDING_ERROR_UNKNOWN;
+ }
+ final int validError = error;
executeOrPostRunnableOnMainThread(new Runnable() {
@MainThread
@Override
@@ -1621,7 +1628,7 @@
try {
if (DEBUG) Log.d(TAG, "notifyError");
if (mSessionCallback != null) {
- mSessionCallback.onError(error);
+ mSessionCallback.onError(validError);
}
} catch (RemoteException e) {
Log.w(TAG, "error in notifyError", e);