diff options
author | Julian Kast <julian@livio.com> | 2020-09-15 14:18:40 -0400 |
---|---|---|
committer | Julian Kast <julian@livio.com> | 2020-09-15 14:18:40 -0400 |
commit | 7f2ed3f8d0c87f7d596655b51ddcd8f2989c86b3 (patch) | |
tree | fda95f9558c23d5dfa07117f03ab4d2504cc8ed3 | |
parent | defdf9f62567494c454984fca17800f8a2aac7b8 (diff) | |
download | sdl_android-Bugfix/issue_1499.tar.gz |
Add NPE check to SoftButtonCapabilities onCapabilityRetrievedBugfix/issue_1499
-rw-r--r-- | base/src/main/java/com/smartdevicelink/managers/screen/BaseSoftButtonManager.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/BaseSoftButtonManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/BaseSoftButtonManager.java index f5e8d6b58..8c70a5b02 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/BaseSoftButtonManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/BaseSoftButtonManager.java @@ -136,7 +136,11 @@ abstract class BaseSoftButtonManager extends BaseSubManager { for (WindowCapability windowCapability : mainDisplay.getWindowCapabilities()) { int currentWindowID = windowCapability.getWindowID() != null ? windowCapability.getWindowID() : PredefinedWindows.DEFAULT_WINDOW.getValue(); if (currentWindowID == PredefinedWindows.DEFAULT_WINDOW.getValue()) { - softButtonCapabilities = windowCapability.getSoftButtonCapabilities().get(0); + if (windowCapability.getSoftButtonCapabilities() != null) { + softButtonCapabilities = windowCapability.getSoftButtonCapabilities().get(0); + } else { + softButtonCapabilities = null; + } break; } } |