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

parent cdc7448b

services/java/com/android/server/SystemServer.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -930,7 +930,9 @@ public final class SystemServer {
		mSystemServiceManager.startService(HdmiControlService.class);
		}

		if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)) {
		mSystemServiceManager.startService(TvInputManagerService.class);
		}

		if (!disableNonCoreServices) {
		try {