Merge "Disable TvInputManagerService on non-TV devices." into lmp-dev

2014-07-25 01:11:12 +00:00
parent 50418d3a44 0fdcb74cc3
commit 2380f36e67
1 changed files with 3 additions and 1 deletions
--- 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 {