summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrettyWhite <geekman3454@protonmail.com>2017-05-04 11:15:05 -0400
committerBrettyWhite <geekman3454@protonmail.com>2017-05-04 11:15:05 -0400
commit6947d26bebcbe3e6d127c9848fcf48924a125fc5 (patch)
tree5f97ed04dd03634ee520030926becccb2828448b
parent9b5dc788df241018dd2a4666a0ff2cc4fa2aebe6 (diff)
downloadsdl_android-6947d26bebcbe3e6d127c9848fcf48924a125fc5.tar.gz
fixed lockscreenmanager NPEbugfix/utest_lockScreenManagerTest
-rw-r--r--sdl_android/src/main/java/com/smartdevicelink/proxy/LockScreenManager.java14
1 files changed, 9 insertions, 5 deletions
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/LockScreenManager.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/LockScreenManager.java
index 1188d28b9..28b1d3dfb 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/LockScreenManager.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/LockScreenManager.java
@@ -41,11 +41,15 @@ public class LockScreenManager {
public synchronized void setHMILevel(HMILevel hmiVal)
{
hmiLevel = hmiVal;
-
- if ( (hmiVal.equals(HMILevel.HMI_FULL)) || (hmiVal.equals(HMILevel.HMI_LIMITED)) )
- setUserSelectedStatus(true);
- else if (hmiVal.equals(HMILevel.HMI_NONE))
- setUserSelectedStatus(false);
+
+ if (hmiVal != null) {
+ if ((hmiVal.equals(HMILevel.HMI_FULL)) || (hmiVal.equals(HMILevel.HMI_LIMITED)))
+ setUserSelectedStatus(true);
+ else if (hmiVal.equals(HMILevel.HMI_NONE))
+ setUserSelectedStatus(false);
+ }else{
+ setUserSelectedStatus(false);
+ }
}
public synchronized OnLockScreenStatus getLockObj(/*int SessionID*/)