Merge "Fix CEC init twice in normal boot" am: 1d1c6ae770

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1517502

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I30b5741fea5441bcae5975c7fa52ac97ca43b313
This commit is contained in:
Nathalie Le Clair
2021-02-09 15:53:30 +00:00
committed by Automerger Merge Worker

View File

@@ -555,7 +555,7 @@ public class HdmiControlService extends SystemService {
private void bootCompleted() { private void bootCompleted() {
// on boot, if device is interactive, set HDMI CEC state as powered on as well // on boot, if device is interactive, set HDMI CEC state as powered on as well
if (mPowerManager.isInteractive() && isPowerStandbyOrTransient()) { if (mPowerManager.isInteractive() && isPowerStandbyOrTransient()) {
onWakeUp(); mPowerStatus = HdmiControlManager.POWER_STATUS_ON;
} }
} }