diff options
| author | Yuncheol Heo <ycheo@google.com> | 2014-09-16 08:42:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-16 08:42:56 +0000 |
| commit | f46a7e2dd72184e5dda1035b14b15eaba8437d11 (patch) | |
| tree | c9111c5db6ccc9f814d01203f156742905c750d4 | |
| parent | 5a51947deec62ec72a73269d511feb0598a93441 (diff) | |
| parent | 41f766394d07d09113d2e64a6917d069d41026c6 (diff) | |
| download | frameworks_base-f46a7e2dd72184e5dda1035b14b15eaba8437d11.zip frameworks_base-f46a7e2dd72184e5dda1035b14b15eaba8437d11.tar.gz frameworks_base-f46a7e2dd72184e5dda1035b14b15eaba8437d11.tar.bz2 | |
am 5c0d3862: Merge "Make the playback device pass CEC CTS." into lmp-dev
* commit '5c0d38626f309598554cd488e9a4c30836875280':
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) { |