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

Merge "CEC: Send <ReportMenuStatus:active> together sending <ActiveSource>." into lmp-mr1-dev automerge: 571cc6b

Browse Source 
automerge: 522e0af

* commit '522e0afa0fc400ceeee034c1b593b73a2787f659':
  CEC: Send <ReportMenuStatus:active> together sending <ActiveSource>.
This commit is contained in:
Yuncheol Heo
2014-10-28 03:40:16 +00:00
committed by android-build-merger
parent 52f67ffc5d 522e0afa0f
commit 9a3e75783e
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
View File

@@ -158,7 +158,7 @@ final class HdmiCecLocalDevicePlayback extends HdmiCecLocalDevice {
assertRunOnServiceThread(); assertRunOnServiceThread();
int physicalAddress = HdmiUtils.twoBytesToInt(message.getParams()); int physicalAddress = HdmiUtils.twoBytesToInt(message.getParams());
maySetActiveSource(physicalAddress); maySetActiveSource(physicalAddress);
maySendActiveSource(); maySendActiveSource(message.getSource());
wakeUpIfActiveSource(); wakeUpIfActiveSource();
return true; // Broadcast message. return true; // Broadcast message.
} }
@@ -198,10 +198,13 @@ final class HdmiCecLocalDevicePlayback extends HdmiCecLocalDevice {
} }
} }
private void maySendActiveSource() { private void maySendActiveSource(int dest) {
if (mIsActiveSource) { if (mIsActiveSource) {
mService.sendCecCommand(HdmiCecMessageBuilder.buildActiveSource( mService.sendCecCommand(HdmiCecMessageBuilder.buildActiveSource(
mAddress, mService.getPhysicalAddress())); mAddress, mService.getPhysicalAddress()));
// Always reports menu-status active to receive RCP.
mService.sendCecCommand(HdmiCecMessageBuilder.buildReportMenuStatus(
mAddress, dest, Constants.MENU_STATE_ACTIVATED));
} }
} }
@@ -209,7 +212,7 @@ final class HdmiCecLocalDevicePlayback extends HdmiCecLocalDevice {
@ServiceThreadOnly @ServiceThreadOnly
protected boolean handleRequestActiveSource(HdmiCecMessage message) { protected boolean handleRequestActiveSource(HdmiCecMessage message) {
assertRunOnServiceThread(); assertRunOnServiceThread();
maySendActiveSource(); maySendActiveSource(message.getSource());
return true; // Broadcast message. return true; // Broadcast message.
} }