diff options
author | Julian Kast <julian@livio.com> | 2020-09-15 14:41:53 -0400 |
---|---|---|
committer | Julian Kast <julian@livio.com> | 2020-09-15 14:41:53 -0400 |
commit | 02ac05a677a0bfb95d2dd23731fc6b3d4507ff31 (patch) | |
tree | 4e745691ec2d100dfa60ba5db624cc31e9786242 | |
parent | 7f2ed3f8d0c87f7d596655b51ddcd8f2989c86b3 (diff) | |
download | sdl_android-02ac05a677a0bfb95d2dd23731fc6b3d4507ff31.tar.gz |
Added additional check to make sure SoftButtonCapabilities are not empty
-rw-r--r-- | base/src/main/java/com/smartdevicelink/managers/screen/BaseSoftButtonManager.java | 2 |
1 files changed, 1 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 8c70a5b02..506bbcd17 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,7 @@ 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()) { - if (windowCapability.getSoftButtonCapabilities() != null) { + if (windowCapability.getSoftButtonCapabilities() != null && windowCapability.getSoftButtonCapabilities().size() > 0) { softButtonCapabilities = windowCapability.getSoftButtonCapabilities().get(0); } else { softButtonCapabilities = null; |