diff options
| author | Bilal Alsharifi <599206+bilal-alsharifi@users.noreply.github.com> | 2019-10-25 09:56:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-25 09:56:44 -0400 |
| commit | 90d6cf122de57a3bee8a00acdc4bd3e9202d5040 (patch) | |
| tree | 271f98de99bdb23102dd2cc964dc7a5ac3c26cc8 | |
| parent | fc73da08ea481ae8d5015f53cfc4fae31d37ead3 (diff) | |
| parent | 4a4622e866dbf21469a39649e65a184f2f446c23 (diff) | |
| download | sdl_android-90d6cf122de57a3bee8a00acdc4bd3e9202d5040.tar.gz | |
Merge pull request #1209 from smartdevicelink/bugfix/null_language
sdl manager crashes when non-mandatory language is null
| -rw-r--r-- | android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java | 2 | ||||
| -rw-r--r-- | javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java index d36106c13..4563d8295 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java @@ -243,7 +243,7 @@ public class SdlManager extends BaseSdlManager{ protected void checkLifecycleConfiguration(){ final Language actualLanguage = this.getRegisterAppInterfaceResponse().getLanguage(); - if (!actualLanguage.equals(hmiLanguage)) { + if (actualLanguage != null && !actualLanguage.equals(hmiLanguage)) { final LifecycleConfigurationUpdate lcu = managerListener.managerShouldUpdateLifecycle(actualLanguage); diff --git a/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java b/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java index 29278b51e..83eb5f9bc 100644 --- a/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java +++ b/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java @@ -233,7 +233,7 @@ public class SdlManager extends BaseSdlManager{ protected void checkLifecycleConfiguration() { final Language actualLanguage = lifecycleManager.getRegisterAppInterfaceResponse().getLanguage(); - if (!actualLanguage.equals(hmiLanguage)) { + if (actualLanguage != null && !actualLanguage.equals(hmiLanguage)) { final LifecycleConfigurationUpdate lcu = managerListener.managerShouldUpdateLifecycle(actualLanguage); |