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

Merge "Invoke callback for HdmiControlService.deviceSelect() for internal source" into lmp-dev

Browse Source
This commit is contained in:
Jinsuk Kim
2014-07-21 05:47:48 +00:00
committed by Android (Google) Code Review
parent 2d5720a028 5ad57168da
commit 75df3bf978
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,7 +135,10 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
void deviceSelect(int targetAddress, IHdmiControlCallback callback) {
assertRunOnServiceThread();
if (targetAddress == Constants.ADDR_INTERNAL) {
handleSelectInternalSource(callback);
handleSelectInternalSource();
// Switching to internal source is always successful even when CEC control is disabled.
setActiveSource(targetAddress);
invokeCallback(callback, HdmiControlManager.RESULT_SUCCESS);
return;
}
if (!mService.isControlEnabled()) {
@@ -153,7 +156,7 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
}
@ServiceThreadOnly
private void handleSelectInternalSource(IHdmiControlCallback callback) {
private void handleSelectInternalSource() {
assertRunOnServiceThread();
// Seq #18
if (mService.isControlEnabled() && getActiveSource() != mAddress) {