diff options
| author | Jinsuk Kim <jinsukkim@google.com> | 2014-07-21 05:47:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-17 22:03:23 +0000 |
| commit | 75df3bf9789de68fba88f8faa44b7c0e9b44aafe (patch) | |
| tree | 226d6bad523dc9cba6a77138afd88d7567b054db /services | |
| parent | 2d5720a028f5cd9e5ee9b8133945589c89d2a6ee (diff) | |
| parent | 5ad57168da6456e8e4935aaa8512a7f77b74b0a1 (diff) | |
| download | frameworks_base-75df3bf9789de68fba88f8faa44b7c0e9b44aafe.zip frameworks_base-75df3bf9789de68fba88f8faa44b7c0e9b44aafe.tar.gz frameworks_base-75df3bf9789de68fba88f8faa44b7c0e9b44aafe.tar.bz2 | |
Merge "Invoke callback for HdmiControlService.deviceSelect() for internal source" into lmp-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java index 6aa86a7..a66f473 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java @@ -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) { |