summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBilal Alsharifi <bilal.alsharifi@gmail.com>2019-10-10 16:06:54 -0400
committerBilal Alsharifi <bilal.alsharifi@gmail.com>2019-10-10 16:06:54 -0400
commit84855cfcb1e10217a91c5f90a951d12ad423466e (patch)
treee05419ff7333e89be672520831e46c7d7e928ba9
parentac66a7929e61274efb3faa1c0746a654051c7d41 (diff)
downloadsdl_android-84855cfcb1e10217a91c5f90a951d12ad423466e.tar.gz
Fix potential NPE in PreloadChoicesOperation
-rw-r--r--base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java
index 6492d2c09..506e677ce 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java
@@ -266,7 +266,7 @@ class PreloadChoicesOperation extends AsynchronousOperation {
if (defaultMainWindowCapability == null ){ return false; }
if (defaultMainWindowCapability.getTextFields() != null){
for (TextField field : defaultMainWindowCapability.getTextFields()){
- if (field.getName().equals(name)){
+ if (field != null && field.getName() != null && field.getName().equals(name)){
return true;
}
}