commit df0d4b80afac3c1ec6b0b8dce99ec96ba99bef48
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Apr 23 15:26:29 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Apr 23 15:26:29 2020 +0000
tree 5a6c55661ef1be6bd0aef7b28dddba4aa8740c41
parent 0f0993ecf489a954523e01bf5bb2d1ae2538d43d
parent 1b8af3fc5101ec78b4e4274baaa2c908adacd7c0

Merge "Add null check for DeviceProductInfo" into rvc-dev am: 8fce9febad am: 741f93dec7 am: 1b8af3fc51

Change-Id: I14dc931f3e917f96ec2747cf36a211996e205b43

java/com/android/libraries/tv/tvsystem/display/DisplayCompatUtil.java

diff --git a/java/com/android/libraries/tv/tvsystem/display/DisplayCompatUtil.java b/java/com/android/libraries/tv/tvsystem/display/DisplayCompatUtil.java
index a3334f8..fb19f98 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 @@
         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;