From 0fdcb74cc39b20e161f08c88414e7672bf9afa23 Mon Sep 17 00:00:00 2001
From: Dongwon Kang <dwkang@google.com>
Date: Thu, 24 Jul 2014 16:28:35 +0900
Subject: [PATCH] Disable TvInputManagerService on non-TV devices.

The block condition is based on FEATURE_LEANBACK instead of
FEATURE_TELEVISION which is deprecated in favor of FEATURE_LEANBACK.

Bug: 16497355
Change-Id: I433051362fe94ea453afe9344800fb4f8c7076a9
---
 services/java/com/android/server/SystemServer.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index bf2edc86867ed..9e67908cca499 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -930,7 +930,9 @@ public final class SystemServer {
                 mSystemServiceManager.startService(HdmiControlService.class);
             }
 
-            mSystemServiceManager.startService(TvInputManagerService.class);
+            if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)) {
+                mSystemServiceManager.startService(TvInputManagerService.class);
+            }
 
             if (!disableNonCoreServices) {
                 try {