diff options
| author | Dongwon Kang <dwkang@google.com> | 2014-07-24 16:28:35 +0900 |
|---|---|---|
| committer | Dongwon Kang <dwkang@google.com> | 2014-07-24 16:28:35 +0900 |
| commit | 0fdcb74cc39b20e161f08c88414e7672bf9afa23 (patch) | |
| tree | 9cbc5efd06a748a35f23a6270978effd7336972e /services/java/com/android/server/SystemServer.java | |
| parent | cdc7448b29b887f6464231c780c23be5e32aef82 (diff) | |
| download | frameworks_base-0fdcb74cc39b20e161f08c88414e7672bf9afa23.zip frameworks_base-0fdcb74cc39b20e161f08c88414e7672bf9afa23.tar.gz frameworks_base-0fdcb74cc39b20e161f08c88414e7672bf9afa23.tar.bz2 | |
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
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index bf2edc8..9e67908 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 { |