Merge "HDMICEC: Rename shouldAcquireWakeLock to be more specific" (4a7253bf) · Commits · e / os / android_frameworks_base

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -3697,7 +3697,7 @@ public class HdmiControlService extends SystemService {
		@ServiceThreadOnly
		@VisibleForTesting
		protected void onStandby(final int standbyAction) {
		if (shouldAcquireWakeLock()) {
		if (shouldAcquireWakeLockOnStandby()) {
		acquireWakeLock();
		}
		mWakeUpMessageReceived = false;
		@@ -3826,7 +3826,7 @@ public class HdmiControlService extends SystemService {
		mStandbyMessageReceived = false;
		}

		private boolean shouldAcquireWakeLock() {
		private boolean shouldAcquireWakeLockOnStandby() {
		boolean sendStandbyOnSleep = false;
		if (tv() != null) {
		sendStandbyOnSleep = mHdmiCecConfig.getIntValue(
		@@ -3842,7 +3842,7 @@ public class HdmiControlService extends SystemService {
		}

		/**
		* Acquire the wake lock used to hold the thread until the standby process is finished.
		* Acquire the wake lock used to hold the system awake until the standby process is finished.
		*/
		@VisibleForTesting
		protected void acquireWakeLock() {