diff options
| author | Julian Kast <julian@livio.com> | 2020-08-26 19:49:04 -0400 |
|---|---|---|
| committer | Julian Kast <julian@livio.com> | 2020-08-26 19:49:04 -0400 |
| commit | 486d2aea3ae8b959bb49a8e01092025d9febb916 (patch) | |
| tree | 390acf30ba73e4d792416472c86ebd566813bc30 | |
| parent | b021ee64d09e4fa843f104c16b55a0e1f1ba3561 (diff) | |
| download | sdl_android-486d2aea3ae8b959bb49a8e01092025d9febb916.tar.gz | |
Added back null check
| -rw-r--r-- | base/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicUpdateOperation.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicUpdateOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicUpdateOperation.java index 485a54fe6..54c7d51d6 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicUpdateOperation.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicUpdateOperation.java @@ -560,7 +560,8 @@ class TextAndGraphicUpdateOperation extends Task { String currentScreenDataPrimaryGraphicName = (currentScreenData != null && currentScreenData.getGraphic() != null) ? currentScreenData.getGraphic().getValue() : null; String primaryGraphicName = updatedState.getPrimaryGraphic() != null ? updatedState.getPrimaryGraphic().getName() : null; return templateSupportsPrimaryArtwork - && !CompareUtils.areStringsEqual(currentScreenDataPrimaryGraphicName, primaryGraphicName, true, true); + && !CompareUtils.areStringsEqual(currentScreenDataPrimaryGraphicName, primaryGraphicName, true, true) + && updatedState.getPrimaryGraphic() != null; } /** @@ -574,7 +575,8 @@ class TextAndGraphicUpdateOperation extends Task { String currentScreenDataSecondaryGraphicName = (currentScreenData != null && currentScreenData.getSecondaryGraphic() != null) ? currentScreenData.getSecondaryGraphic().getValue() : null; String secondaryGraphicName = updatedState.getSecondaryGraphic() != null ? updatedState.getSecondaryGraphic().getName() : null; return templateSupportsSecondaryArtwork - && !CompareUtils.areStringsEqual(currentScreenDataSecondaryGraphicName, secondaryGraphicName, true, true); + && !CompareUtils.areStringsEqual(currentScreenDataSecondaryGraphicName, secondaryGraphicName, true, true) + && updatedState.getSecondaryGraphic() != null; } /** |