From 6cef86ca76ec26f2e6edfa8bd418e1f1fc892a45 Mon Sep 17 00:00:00 2001
From: Amy <amyjojo@google.com>
Date: Thu, 30 Aug 2018 19:06:47 -0700
Subject: [PATCH] Fix HandleActiveSource logic

ag/4912469

Test: local test
Change-Id: I399cd254765d8a200f252b6b89fb85e570ca6155
---
 .../com/android/server/hdmi/HdmiCecLocalDeviceSource.java    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceSource.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceSource.java
index f9180b798a77b..c2e2d41d975d5 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceSource.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceSource.java
@@ -84,11 +84,10 @@ abstract class HdmiCecLocalDeviceSource extends HdmiCecLocalDevice {
         int logicalAddress = message.getSource();
         int physicalAddress = HdmiUtils.twoBytesToInt(message.getParams());
         ActiveSource activeSource = ActiveSource.of(logicalAddress, physicalAddress);
-        if (physicalAddress != mService.getPhysicalAddress()
-                || !mActiveSource.equals(activeSource)) {
+        if (!mActiveSource.equals(activeSource)) {
             setActiveSource(activeSource);
-            setActiveSource(false);
         }
+        setActiveSource(physicalAddress == mService.getPhysicalAddress());
         return true;
     }