Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 5304649b: am 2cd3ac47: Merge "CEC: Support sendStandby() for MHL device" into lmp-mr1-dev

Browse Source 
* commit '5304649ba89c9ebdd792e83761f8f4098c6d6465':
  CEC: Support sendStandby() for MHL device
This commit is contained in:
Jinsuk Kim
2015-01-15 05:19:53 +00:00
committed by Android Git Automerger
parent 5baa164aec 5304649ba8
commit b098c2dca4
3 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/hdmi/HdmiControlService.java
View File

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

4
services/core/java/com/android/server/hdmi/HdmiMhlControllerStub.java
View File

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

3
services/core/java/com/android/server/hdmi/HdmiMhlLocalDeviceStub.java
View File

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