diff options
| author | Bilal Alsharifi <599206+bilal-alsharifi@users.noreply.github.com> | 2020-09-15 17:02:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-15 17:02:19 -0400 |
| commit | de8e5c9a71ba2c4c793bcf6fcccbb964fe25853a (patch) | |
| tree | 2bcb3bcc108dc85e734dd856313c3baa005069ce | |
| parent | d9c4e71c3bf2fb3443f507331fd72ac6f727c824 (diff) | |
| parent | 02ac05a677a0bfb95d2dd23731fc6b3d4507ff31 (diff) | |
| download | sdl_android-de8e5c9a71ba2c4c793bcf6fcccbb964fe25853a.tar.gz | |
Merge pull request #1500 from smartdevicelink/Bugfix/issue_1499
Add NPE check to SoftButtonCapabilities onCapabilityRetrieved
| -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 172a3b00f..690e8e5b9 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 && windowCapability.getSoftButtonCapabilities().size() > 0) { + softButtonCapabilities = windowCapability.getSoftButtonCapabilities().get(0); + } else { + softButtonCapabilities = null; + } break; } } |