Skip to content

Commit 7f2ed3f

Browse files
author
Julian Kast
committed
Add NPE check to SoftButtonCapabilities onCapabilityRetrieved
1 parent defdf9f commit 7f2ed3f

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

base/src/main/java/com/smartdevicelink/managers/screen/BaseSoftButtonManager.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,11 @@ public void onCapabilityRetrieved(Object capability) {
136136
for (WindowCapability windowCapability : mainDisplay.getWindowCapabilities()) {
137137
int currentWindowID = windowCapability.getWindowID() != null ? windowCapability.getWindowID() : PredefinedWindows.DEFAULT_WINDOW.getValue();
138138
if (currentWindowID == PredefinedWindows.DEFAULT_WINDOW.getValue()) {
139-
softButtonCapabilities = windowCapability.getSoftButtonCapabilities().get(0);
139+
if (windowCapability.getSoftButtonCapabilities() != null) {
140+
softButtonCapabilities = windowCapability.getSoftButtonCapabilities().get(0);
141+
} else {
142+
softButtonCapabilities = null;
143+
}
140144
break;
141145
}
142146
}

0 commit comments

Comments
 (0)