Fix logic handling for dismiss “null” case param

1 files changed, 6 insertions, 2 deletions

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java
index f11705f94..de935bad1 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java
@@ -76,7 +76,7 @@ public class LockScreenManager extends BaseSubManager {
     private OnRPCNotificationListener systemRequestListener, ddListener, hmiListener;
     private String deviceIconUrl;
     boolean driverDistStatus;
-    boolean isLockscreenDismissible;
+    boolean isLockscreenDismissible = false;
     boolean enableDismissGesture;
     final boolean lockScreenEnabled;
     final boolean deviceLogoEnabled;
@@ -203,7 +203,10 @@ public class LockScreenManager extends BaseSubManager {
                         driverDistStatus = DriverDistractionState.DD_ON.equals(ddState.getState());
                         mLockscreenWarningMsg = ddState.getLockscreenWarningMessage();
                         boolean previousDismissibleState = isLockscreenDismissible;
-                        isLockscreenDismissible = ddState.getLockscreenDismissibility() != null && ddState.getLockscreenDismissibility();
+                        if(ddState.getLockscreenDismissibility() == null ) {
+                            isLockscreenDismissible = ddState.getLockscreenDismissibility();
+                        } //If the param is null, we assume it stays as the previous value
+
                         DebugTool.logInfo(TAG, "Lock screen dismissible: " + isLockscreenDismissible);
 
                         if (displayMode == LockScreenConfig.DISPLAY_MODE_ALWAYS) {
@@ -300,6 +303,7 @@ public class LockScreenManager extends BaseSubManager {
         };
     }
 
+
     ////
     // LAUNCH LOCK SCREEN LOGIC
     ////