Skip to content

Commit 90d6cf1

Browse files
Merge pull request #1209 from smartdevicelink/bugfix/null_language
sdl manager crashes when non-mandatory language is null
2 parents fc73da0 + 4a4622e commit 90d6cf1

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ public void onComplete(boolean success) {
243243
protected void checkLifecycleConfiguration(){
244244
final Language actualLanguage = this.getRegisterAppInterfaceResponse().getLanguage();
245245

246-
if (!actualLanguage.equals(hmiLanguage)) {
246+
if (actualLanguage != null && !actualLanguage.equals(hmiLanguage)) {
247247

248248
final LifecycleConfigurationUpdate lcu = managerListener.managerShouldUpdateLifecycle(actualLanguage);
249249

javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ public void onComplete(boolean success) {
233233
protected void checkLifecycleConfiguration() {
234234
final Language actualLanguage = lifecycleManager.getRegisterAppInterfaceResponse().getLanguage();
235235

236-
if (!actualLanguage.equals(hmiLanguage)) {
236+
if (actualLanguage != null && !actualLanguage.equals(hmiLanguage)) {
237237

238238
final LifecycleConfigurationUpdate lcu = managerListener.managerShouldUpdateLifecycle(actualLanguage);
239239

0 commit comments

Comments
 (0)