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

Merge "CEC: Add CEC device upon receiving <Report Physical Address>" into lmp-mr1-dev

Browse Source
This commit is contained in:
Jinsuk Kim
2015-01-29 22:21:53 +00:00
committed by Android (Google) Code Review
parent af461e12a1 7cd4a589af
commit 3f92347424
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
View File

@@ -581,6 +581,12 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
if (!isInDeviceList(address, path)) { if (!isInDeviceList(address, path)) {
handleNewDeviceAtTheTailOfActivePath(path); handleNewDeviceAtTheTailOfActivePath(path);
} }
// Add the device ahead with default information to handle <Active Source>
// promptly, rather than waiting till the new device action is finished.
HdmiDeviceInfo deviceInfo = new HdmiDeviceInfo(address, path, getPortId(path), type,
Constants.UNKNOWN_VENDOR_ID, HdmiUtils.getDefaultDeviceName(address));
addCecDevice(deviceInfo);
startNewDeviceAction(ActiveSource.of(address, path), type); startNewDeviceAction(ActiveSource.of(address, path), type);
return true; return true;
} }
@@ -1496,7 +1502,7 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
* @return true if exist; otherwise false * @return true if exist; otherwise false
*/ */
@ServiceThreadOnly @ServiceThreadOnly
private boolean isInDeviceList(int logicalAddress, int physicalAddress) { boolean isInDeviceList(int logicalAddress, int physicalAddress) {
assertRunOnServiceThread(); assertRunOnServiceThread();
HdmiDeviceInfo device = getCecDeviceInfo(logicalAddress); HdmiDeviceInfo device = getCecDeviceInfo(logicalAddress);
if (device == null) { if (device == null) {

6
services/core/java/com/android/server/hdmi/NewDeviceAction.java
View File

@@ -163,6 +163,12 @@ final class NewDeviceAction extends HdmiCecFeatureAction {
} }
private void addDeviceInfo() { private void addDeviceInfo() {
// The device should be in the device list with default information.
if (!tv().isInDeviceList(mDeviceLogicalAddress, mDevicePhysicalAddress)) {
Slog.w(TAG, String.format("Device not found (%02x, %04x)",
mDeviceLogicalAddress, mDevicePhysicalAddress));
return;
}
if (mDisplayName == null) { if (mDisplayName == null) {
mDisplayName = HdmiUtils.getDefaultDeviceName(mDeviceLogicalAddress); mDisplayName = HdmiUtils.getDefaultDeviceName(mDeviceLogicalAddress);
} }