diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-04-23 14:43:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-04-23 14:43:39 +0000 |
| commit | 8fce9febad998d5646f04f0ef164e6114b8a9c80 (patch) | |
| tree | 5a6c55661ef1be6bd0aef7b28dddba4aa8740c41 | |
| parent | e91659e8dc36487f89eb259609af752dff747139 (diff) | |
| parent | 059789867e8b1e9e60354d723d1ade217291c3de (diff) | |
| download | tvsystem-8fce9febad998d5646f04f0ef164e6114b8a9c80.tar.gz | |
Merge "Add null check for DeviceProductInfo" into rvc-dev
| -rw-r--r-- | java/com/android/libraries/tv/tvsystem/display/DisplayCompatUtil.java | 3 |
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 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 @@ 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; |