Merge "CEC: Support sendStandby() for MHL device" into lmp-mr1-dev

services/core/java/com/android/server/hdmi/HdmiControlService.java

@@ -1427,6 +1427,11 @@ public final class HdmiControlService extends SystemService {
             runOnServiceThread(new Runnable() {
                 @Override
                 public void run() {
+                    HdmiMhlLocalDeviceStub mhlDevice = mMhlController.getLocalDeviceById(deviceId);
+                    if (mhlDevice != null) {
+                        mhlDevice.sendStandby();
+                        return;
+                    }
                     HdmiCecLocalDevice device = mCecController.getLocalDevice(deviceType);
                     if (device == null) {
                         Slog.w(TAG, "Local device not available");
@@ -1546,6 +1551,12 @@ public final class HdmiControlService extends SystemService {
                 mCecController.dump(pw);
                 pw.decreaseIndent();
             }
+
+            pw.println("mMhlController: ");
+            pw.increaseIndent();
+            mMhlController.dump(pw);
+            pw.decreaseIndent();
+
             pw.println("mPortInfo: ");
             pw.increaseIndent();
             for (HdmiPortInfo hdmiPortInfo : mPortInfo) {

services/core/java/com/android/server/hdmi/HdmiMhlControllerStub.java

@@ -19,6 +19,7 @@ package com.android.server.hdmi;
 import android.hardware.hdmi.HdmiPortInfo;
 import android.util.SparseArray;
 
+import com.android.internal.util.IndentingPrintWriter;
 import com.android.server.hdmi.HdmiControlService.SendMessageCallback;
 
 /**
@@ -135,4 +136,7 @@ final class HdmiMhlControllerStub {
     int getEcbusDeviceRoles(int portId) {
         return INVALID_DEVICE_ROLES;
     }
+
+    void dump(IndentingPrintWriter pw) {
+    }
 }

services/core/java/com/android/server/hdmi/HdmiMhlLocalDeviceStub.java

@@ -43,4 +43,7 @@ final class HdmiMhlLocalDeviceStub {
 
     void sendKeyEvent(int keycode, boolean isPressed) {
     }
+
+    void sendStandby() {
+    }
 }