summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Grover <joeygrover@gmail.com>2019-10-09 14:51:55 -0400
committerJoey Grover <joeygrover@gmail.com>2019-10-09 14:51:55 -0400
commit1f28bd0f427a373ada982b8a8f200c0d9396c619 (patch)
tree3890faaf30be26f48d2e3675cdbe977ce59ba3ea
parente3f5b8be1e89c5df4eaabef7f966a712aab58f96 (diff)
downloadsdl_android-1f28bd0f427a373ada982b8a8f200c0d9396c619.tar.gz
Fix #1193
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlArtwork.java4
-rw-r--r--javaSE/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlArtwork.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlArtwork.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlArtwork.java
index b1885d1a9..e5108fd40 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlArtwork.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlArtwork.java
@@ -110,8 +110,8 @@ public class SdlArtwork extends SdlFile implements Cloneable{
}
@Override
- public void setType(@NonNull FileType fileType) {
- if(fileType.equals(FileType.GRAPHIC_JPEG) || fileType.equals(FileType.GRAPHIC_PNG)
+ public void setType(FileType fileType) {
+ if(fileType == null || fileType.equals(FileType.GRAPHIC_JPEG) || fileType.equals(FileType.GRAPHIC_PNG)
|| fileType.equals(FileType.GRAPHIC_BMP)){
super.setType(fileType);
}else{
diff --git a/javaSE/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlArtwork.java b/javaSE/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlArtwork.java
index f13b523aa..1bae6054d 100644
--- a/javaSE/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlArtwork.java
+++ b/javaSE/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlArtwork.java
@@ -97,8 +97,8 @@ public class SdlArtwork extends SdlFile implements Cloneable{
@Override
- public void setType(@NonNull FileType fileType) {
- if(fileType.equals(FileType.GRAPHIC_JPEG) || fileType.equals(FileType.GRAPHIC_PNG)
+ public void setType(FileType fileType) {
+ if(fileType == null || fileType.equals(FileType.GRAPHIC_JPEG) || fileType.equals(FileType.GRAPHIC_PNG)
|| fileType.equals(FileType.GRAPHIC_BMP)){
super.setType(fileType);
}else{