Merge "Fix CEC init twice in normal boot" into sc-dev (c7a460d5) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/hdmi/HdmiControlService.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -541,7 +541,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(WAKE_UP_BOOT_UP);		mPowerStatusController.setPowerStatus(HdmiControlManager.POWER_STATUS_ON);
	}		}
	}		}