diff options
| author | Julian Kast <julian@livio.com> | 2020-03-13 14:01:14 -0400 |
|---|---|---|
| committer | Julian Kast <julian@livio.com> | 2020-03-13 14:01:14 -0400 |
| commit | d0ab2b725be1556eee326b89a8788a9768971ab0 (patch) | |
| tree | 6d7394908ad296da966a0b5bdab0c999cb48dd3d | |
| parent | 182196a13aa22229d8903bb63397130601cbf683 (diff) | |
| download | sdl_android-bugfix/issue_1257_2.0.tar.gz | |
Added Null check for artworkbugfix/issue_1257_2.0
| -rw-r--r-- | base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceCell.java | 2 | ||||
| -rw-r--r-- | base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuCell.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceCell.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceCell.java index 57761087f..3d0e7e49d 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceCell.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceCell.java @@ -224,7 +224,7 @@ public class ChoiceCell { result += ((getText() == null) ? 0 : Integer.rotateLeft(getText().hashCode(), 1)); result += ((getSecondaryText() == null) ? 0 : Integer.rotateLeft(getSecondaryText().hashCode(), 2)); result += ((getTertiaryText() == null) ? 0 : Integer.rotateLeft(getTertiaryText().hashCode(), 3)); - result += Integer.rotateLeft(getArtwork().hashCode(), 4); + result += ((getArtwork() == null) ? 0 : Integer.rotateLeft(getArtwork().hashCode(), 4)); result += ((getSecondaryArtwork() == null || getSecondaryArtwork().getName() == null) ? 0 : Integer.rotateLeft(getSecondaryArtwork().getName().hashCode(), 5)); result += ((getVoiceCommands() == null) ? 0 : Integer.rotateLeft(getVoiceCommands().hashCode(), 6)); return result; diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuCell.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuCell.java index 55950efda..6f69993ee 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuCell.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuCell.java @@ -299,7 +299,7 @@ public class MenuCell implements Cloneable{ public int hashCode() { int result = 1; result += ((getTitle() == null) ? 0 : Integer.rotateLeft(getTitle().hashCode(), 1)); - result += Integer.rotateLeft(getIcon().hashCode(), 2); + result += ((getIcon() == null) ? 0 : Integer.rotateLeft(getIcon().hashCode(), 2)); result += ((getVoiceCommands() == null) ? 0 : Integer.rotateLeft(getVoiceCommands().hashCode(), 3)); result += ((getSubCells() == null) ? 0 : Integer.rotateLeft(1, 4)); return result; |