diff options
| author | Jinsuk Kim <jinsukkim@google.com> | 2015-05-06 22:07:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-06 22:07:23 +0000 |
| commit | e184a6b9ac6d2f871bc094665bef5efa7f2292e5 (patch) | |
| tree | 160fa218fcef2fff58275fc88fd57202b57a4c90 /services | |
| parent | 41fe5292fdf692ffba5b80e984113d431ce7d2fd (diff) | |
| parent | 7cc51c631d6e7e5680ce661089524b7335d88756 (diff) | |
| download | frameworks_base-e184a6b9ac6d2f871bc094665bef5efa7f2292e5.zip frameworks_base-e184a6b9ac6d2f871bc094665bef5efa7f2292e5.tar.gz frameworks_base-e184a6b9ac6d2f871bc094665bef5efa7f2292e5.tar.bz2 | |
Merge "CEC: Reset active source/path before going into standby" into mnc-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java index 5ac027d..e650456 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java @@ -486,6 +486,7 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { HdmiLogger.debug("Input not ready for device: %X; buffering the command", info.getId()); mDelayedMessageBuffer.add(message); } else { + updateDevicePowerStatus(logicalAddress, HdmiControlManager.POWER_STATUS_ON); ActiveSource activeSource = ActiveSource.of(logicalAddress, physicalAddress); ActiveSourceHandler.create(this, null).process(activeSource, info.getDeviceType()); } @@ -1613,6 +1614,8 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { super.disableDevice(initiatedByCec, callback); clearDeviceInfoList(); + getActiveSource().invalidate(); + setActivePath(Constants.INVALID_PHYSICAL_ADDRESS); checkIfPendingActionsCleared(); } |