Add null check for DeviceProductInfo

This fixes a NPE when DeviceProductInfo is not
available, e.g. when HWC doesn't provide display
identification data (EDID).

Bug: 154745619
Test: manually test that NPE doesn't reproduce
Change-Id: I80441541a2aec474c27d0d8b51cb46204e0a14c3

1 files changed, 3 insertions, 0 deletions

diff --git a/java/com/android/libraries/tv/tvsystem/display/DisplayCompatUtil.java b/java/com/android/libraries/tv/tvsystem/display/DisplayCompatUtil.java
index 4b8da67..f2badb4 100644
--- a/java/com/android/libraries/tv/tvsystem/display/DisplayCompatUtil.java
+++ b/java/com/android/libraries/tv/tvsystem/display/DisplayCompatUtil.java
@@ -52,6 +52,9 @@ public final class DisplayCompatUtil {
         DisplayInfo displayInfo = new DisplayInfo();
         display.getDisplayInfo(displayInfo);
         android.hardware.display.DeviceProductInfo info = displayInfo.deviceProductInfo;
+        if (info == null) {
+            return null;
+        }
         DeviceProductInfo.ManufactureDate manufactureDate;
         if (info.getManufactureDate() == null) {
             manufactureDate = null;