Merge "CEC: Let MHL device be of type 'source'" into lmp-mr1-dev

2015-01-05 07:10:05 +00:00
parent b65ad80de1 e416d0f67b
commit 6cfb44952a
1 changed files with 9 additions and 3 deletions
--- a/core/java/android/hardware/hdmi/HdmiDeviceInfo.java
+++ b/core/java/android/hardware/hdmi/HdmiDeviceInfo.java
@@ -336,9 +336,15 @@ public class HdmiDeviceInfo implements Parcelable {
     * Returns {@code true} if the device is of a type that can be an input source.
     */
    public boolean isSourceType() {
-        return mDeviceType == DEVICE_PLAYBACK
-                || mDeviceType == DEVICE_RECORDER
-                || mDeviceType == DEVICE_TUNER;
+        if (isCecDevice()) {
+            return mDeviceType == DEVICE_PLAYBACK
+                    || mDeviceType == DEVICE_RECORDER
+                    || mDeviceType == DEVICE_TUNER;
+        } else if (isMhlDevice()) {
+            return true;
+        } else {
+            return false;
+        }
    }

    /**