diff options
| author | Jinsuk Kim <jinsukkim@google.com> | 2015-03-30 17:14:58 +0900 |
|---|---|---|
| committer | Jinsuk Kim <jinsukkim@google.com> | 2015-04-02 12:10:24 +0900 |
| commit | a5445ce992a4e8ac5252975acedf3e5aec53867a (patch) | |
| tree | 15cb4e8f2daabe9e28bbd8f219607d3b30493d44 /services/core/java/com/android/server/hdmi | |
| parent | 2ea13d42689ab10456a575772d069c91ae9b6075 (diff) | |
| download | frameworks_base-a5445ce992a4e8ac5252975acedf3e5aec53867a.zip frameworks_base-a5445ce992a4e8ac5252975acedf3e5aec53867a.tar.gz frameworks_base-a5445ce992a4e8ac5252975acedf3e5aec53867a.tar.bz2 | |
CEC: Let arc termination start before standby
Bug: 19930352
Change-Id: Ie344f06a66beafecf64eccadc1881c4d2ec170b3
Diffstat (limited to 'services/core/java/com/android/server/hdmi')
| -rw-r--r-- | services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java index d17e9b3..d0c8202 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java @@ -636,7 +636,7 @@ abstract class HdmiCecLocalDevice { void addAndStartAction(final HdmiCecFeatureAction action) { assertRunOnServiceThread(); mActions.add(action); - if (mService.isPowerStandbyOrTransient()) { + if (mService.isPowerStandby()) { Slog.i(TAG, "Not ready to start action. Queued for deferred start:" + action); return; } diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java index d5cb5e3..83537d8 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java @@ -1572,7 +1572,6 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { @Override @ServiceThreadOnly protected void disableDevice(boolean initiatedByCec, PendingActionClearedCallback callback) { - super.disableDevice(initiatedByCec, callback); assertRunOnServiceThread(); mService.unregisterTvInputCallback(mTvInputCallback); // Remove any repeated working actions. @@ -1588,6 +1587,8 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { disableSystemAudioIfExist(); disableArcIfExist(); + + super.disableDevice(initiatedByCec, callback); clearDeviceInfoList(); checkIfPendingActionsCleared(); } |