Add the system feature for HDMI-CEC.
Change-Id: I2a985cedf49d50649c89f2ac5fbb80a81300156d
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index 7e783eb..03d4701 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -1454,6 +1454,14 @@
public static final String FEATURE_ETHERNET = "android.hardware.ethernet";
/**
+ * Feature for {@link #getSystemAvailableFeatures} and
+ * {@link #hasSystemFeature}: This device supports HDMI-CEC.
+ * @hide
+ */
+ @SdkConstant(SdkConstantType.FEATURE)
+ public static final String FEATURE_HDMI_CEC = "android.hardware.hdmi.cec";
+
+ /**
* Action to external storage service to clean out removed apps.
* @hide
*/
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index e0ebd54..8d38827 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -910,7 +910,9 @@
mSystemServiceManager.startService(MediaSessionService.class);
- mSystemServiceManager.startService(HdmiControlService.class);
+ if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_HDMI_CEC)) {
+ mSystemServiceManager.startService(HdmiControlService.class);
+ }
mSystemServiceManager.startService(TvInputManagerService.class);