commit 1b8af3fc5101ec78b4e4274baaa2c908adacd7c0
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Apr 23 15:07:32 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Apr 23 15:07:32 2020 +0000
tree 5a6c55661ef1be6bd0aef7b28dddba4aa8740c41
parent 208720996288cf0acfde72ee262c81e967d36544
parent 741f93dec70aeb65373626485f525345135d5e64

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

Change-Id: I17d212fb199d6fad6a500a1c48ab464c6a172237

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;