From 63f653a02d0145c054a857502d6b5548f6e8a6ae Mon Sep 17 00:00:00 2001
From: Marvin Ramin <marvinramin@google.com>
Date: Thu, 29 Oct 2020 13:10:59 +0100
Subject: [PATCH] Fix unit test failure

Fix failing unit test: HdmiControlServiceBinderAPITest#oneTouchPlay_addressNotAllocated

Test fails as no logical address is allocated, causing a NPE in
HdmiCecLocalDeviceSource#isActiveSource.

Bug: 171956637
Test: atest com.android.server.hdmi
Change-Id: I75f4bb96b2bfae3f85d2c6a3eca8923b88363eb7
---
 .../com/android/server/hdmi/HdmiCecLocalDeviceSource.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceSource.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceSource.java
index 4325f797416e6..960510693f6aa 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceSource.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceSource.java
@@ -246,6 +246,10 @@ abstract class HdmiCecLocalDeviceSource extends HdmiCecLocalDevice {
     // Indicates if current device is the active source or not
     @ServiceThreadOnly
     protected boolean isActiveSource() {
+        if (getDeviceInfo() == null) {
+            return false;
+        }
+
         return getActiveSource().equals(getDeviceInfo().getLogicalAddress(),
                 getDeviceInfo().getPhysicalAddress());
     }