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

CEC: Ensure stable AVR connection

Browse Source 
Make sure AVR device removal due to hotplug detection failure occur
in a less strict manner - doing it only if the failure is detected
3 times in a row.

Bug: 19171321
Change-Id: I1479663b05cdc957cc52123799c756f6b74f6708
This commit is contained in:
Jinsuk Kim
2015-01-29 07:34:34 +09:00
parent 2ee0d6f44d
commit 07600116b5
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
services/core/java/com/android/server/hdmi/HotplugDetectionAction.java
View File

@@ -38,6 +38,7 @@ final class HotplugDetectionAction extends HdmiCecFeatureAction {
private static final int POLLING_INTERVAL_MS = 5000; private static final int POLLING_INTERVAL_MS = 5000;
private static final int TIMEOUT_COUNT = 3; private static final int TIMEOUT_COUNT = 3;
private static final int AVR_COUNT_MAX = 3;
// State in which waits for next polling // State in which waits for next polling
private static final int STATE_WAIT_FOR_NEXT_POLLING = 1; private static final int STATE_WAIT_FOR_NEXT_POLLING = 1;
@@ -48,6 +49,12 @@ final class HotplugDetectionAction extends HdmiCecFeatureAction {
private int mTimeoutCount = 0; private int mTimeoutCount = 0;
// Counter used to ensure the connection to AVR is stable. Occasional failure to get
// polling response from AVR despite its presence leads to unstable status flipping.
// This is a workaround to deal with it, by removing the device only if the removal
// is detected {@code AVR_COUNT_MAX} times in a row.
private int mAvrStatusCount = 0;
/** /**
* Constructor * Constructor
* *
@@ -148,10 +155,22 @@ final class HotplugDetectionAction extends HdmiCecFeatureAction {
BitSet removed = complement(currentInfos, polledResult); BitSet removed = complement(currentInfos, polledResult);
int index = -1; int index = -1;
while ((index = removed.nextSetBit(index + 1)) != -1) { while ((index = removed.nextSetBit(index + 1)) != -1) {
if (index == Constants.ADDR_AUDIO_SYSTEM) {
++mAvrStatusCount;
Slog.w(TAG, "Ack not returned from AVR. count: " + mAvrStatusCount);
if (mAvrStatusCount < AVR_COUNT_MAX) {
continue;
}
}
Slog.v(TAG, "Remove device by hot-plug detection:" + index); Slog.v(TAG, "Remove device by hot-plug detection:" + index);
removeDevice(index); removeDevice(index);
} }
// Reset the counter if the ack is returned from AVR.
if (!removed.get(Constants.ADDR_AUDIO_SYSTEM)) {
mAvrStatusCount = 0;
}
// Next, check added devices. // Next, check added devices.
BitSet added = complement(polledResult, currentInfos); BitSet added = complement(polledResult, currentInfos);
index = -1; index = -1;