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

Merge "CEC: Defer CEC actions until logical address is available" into nyc-dev

Browse Source
This commit is contained in:
Donghyun Cho
2016-05-16 04:48:28 +00:00
committed by Android (Google) Code Review
parent 123274f479 fc462b962c
commit 4853d65a60
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java
View File

@@ -650,7 +650,7 @@ abstract class HdmiCecLocalDevice {
void addAndStartAction(final HdmiCecFeatureAction action) { void addAndStartAction(final HdmiCecFeatureAction action) {
assertRunOnServiceThread(); assertRunOnServiceThread();
mActions.add(action); mActions.add(action);
if (mService.isPowerStandby()) { if (mService.isPowerStandby() || !mService.isAddressAllocated()) {
Slog.i(TAG, "Not ready to start action. Queued for deferred start:" + action); Slog.i(TAG, "Not ready to start action. Queued for deferred start:" + action);
return; return;
} }

4
services/core/java/com/android/server/hdmi/HdmiControlService.java
View File

@@ -641,6 +641,10 @@ public final class HdmiControlService extends SystemService {
} }
} }
boolean isAddressAllocated() {
return mAddressAllocated;
}
// Initialize HDMI port information. Combine the information from CEC and MHL HAL and // Initialize HDMI port information. Combine the information from CEC and MHL HAL and
// keep them in one place. // keep them in one place.
@ServiceThreadOnly @ServiceThreadOnly