diff options
| author | Yuncheol Heo <ycheo@google.com> | 2014-09-16 09:13:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-16 09:13:09 +0000 |
| commit | fb49146c7ab0f5d0c03e61d3d3fce6c889e50afb (patch) | |
| tree | 50db618683055ebaaf2b3c7f5e12e3c2b1864a0f | |
| parent | 8f06311db699c46cfa7ef3e29f54e45942a9234b (diff) | |
| parent | 44ed50977a9f74bdaa8c156b13171f98245fb015 (diff) | |
| download | frameworks_base-fb49146c7ab0f5d0c03e61d3d3fce6c889e50afb.zip frameworks_base-fb49146c7ab0f5d0c03e61d3d3fce6c889e50afb.tar.gz frameworks_base-fb49146c7ab0f5d0c03e61d3d3fce6c889e50afb.tar.bz2 | |
am 2edc7f24: am ddf679ec: am 5c0d3862: Merge "Make the playback device pass CEC CTS." into lmp-dev
* commit '2edc7f24468e3b609c78cbfa767b83240f5b17f5':
Make the playback device pass CEC CTS.
| -rw-r--r-- | services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/hdmi/HdmiControlService.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java index 6603a71..3bd0bcf 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java @@ -121,7 +121,7 @@ final class HdmiCecLocalDevicePlayback extends HdmiCecLocalDevice { void onHotplug(int portId, boolean connected) { assertRunOnServiceThread(); mCecMessageCache.flushAll(); - mIsActiveSource = false; + // We'll not clear mIsActiveSource on the hotplug event to pass CETC 11.2.2-2 ~ 3. if (connected && mService.isPowerStandbyOrTransient()) { mService.wakeUp(); } diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java index 96823e1..9a34047 100644 --- a/services/core/java/com/android/server/hdmi/HdmiControlService.java +++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java @@ -428,6 +428,7 @@ public final class HdmiControlService extends SystemService { private void allocateLogicalAddress(final ArrayList<HdmiCecLocalDevice> allocatingDevices, final int initiatedBy) { assertRunOnServiceThread(); + mCecController.clearLogicalAddress(); final ArrayList<HdmiCecLocalDevice> allocatedDevices = new ArrayList<>(); final int[] finished = new int[1]; for (final HdmiCecLocalDevice localDevice : allocatingDevices) { |