Merge "Start HOME activity only if we are not on it yet"

1 files changed, 4 insertions, 1 deletions

diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java
index 1b495f59b0fe..f9ef3981c27b 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java
@@ -1150,7 +1150,10 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource {
         }
         // Wake up if the current device if ready to route.
         mService.wakeUp();
-        if (portId == Constants.CEC_SWITCH_HOME && mService.isPlaybackDevice()) {
+        // Switch to HOME if the current active port is not HOME yet
+        if (portId == Constants.CEC_SWITCH_HOME
+            && mService.isPlaybackDevice()
+            && getLocalActivePort() != Constants.CEC_SWITCH_HOME) {
             switchToHomeTvInput();
         } else if (portId == Constants.CEC_SWITCH_ARC) {
             switchToTvInput(SystemProperties.get(Constants.PROPERTY_SYSTEM_AUDIO_DEVICE_ARC_PORT));