am 7edaf55a: Merge "TIF: fix setSurface() logic" into lmp-mr1-dev

* commit '7edaf55aab6fb14a640904015e10e2f5c9299423': TIF: fix setSurface() logic
2014-11-20 18:54:52 +00:00
parent de04d5573a 7edaf55aab
commit 89d8fb555a
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/tv/TvInputHardwareManager.java
+++ b/services/core/java/com/android/server/tv/TvInputHardwareManager.java
@@ -681,7 +681,7 @@ class TvInputHardwareManager implements TvInputHal.Callback {
                    throw new IllegalStateException("Device already released.");
                }

-                int result = TvInputHal.ERROR_UNKNOWN;
+                int result = TvInputHal.SUCCESS;
                if (surface == null) {
                    // The value of config is ignored when surface == null.
                    if (mActiveConfig != null) {