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

automerge: 71bda35 * commit '71bda351510330c1a6c21474f518fa2f53bf4794': TIF: fix setSurface() logic
2014-11-21 01:57:46 +00:00
parent a0715af6b1 71bda35151
commit 1c10503c4c
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) {