Merge "Make getAvailability() always return true"

2014-06-19 23:33:17 +00:00
parent 6e335c44c6 ab981c5653
commit b0586c9228
1 changed files with 3 additions and 1 deletions
--- a/services/core/java/com/android/server/tv/TvInputManagerService.java
+++ b/services/core/java/com/android/server/tv/TvInputManagerService.java
@@ -631,7 +631,9 @@ public final class TvInputManagerService extends SystemService {
            } finally {
                Binder.restoreCallingIdentity(identity);
            }
-            return false;
+            // STOPSHIP: Redesign the API around the availability change. For now, the service
+            // will be always available.
+            return true;
        }

        @Override