commit 7edaf55aab6fb14a640904015e10e2f5c9299423
author Jae Seo <jaeseo@google.com> Thu Nov 20 18:51:30 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 20 18:51:32 2014 +0000
tree b96ce98144aad19a4bf6267a8f6381c4db065dc3
parent 7c122b60b93c9ef4fa428bc142ea61bf4252b70b
parent 102670f16a44d4b25d7e3a252bedee0208b68c55

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

services/core/java/com/android/server/tv/TvInputHardwareManager.java

diff --git a/services/core/java/com/android/server/tv/TvInputHardwareManager.java b/services/core/java/com/android/server/tv/TvInputHardwareManager.java
index c3cbbd3..716487c 100644
--- a/services/core/java/com/android/server/tv/TvInputHardwareManager.java
+++ b/services/core/java/com/android/server/tv/TvInputHardwareManager.java
@@ -681,7 +681,7 @@
                     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) {