diff options
| author | Joey Grover <joeygrover@gmail.com> | 2017-05-05 10:55:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-05 10:55:17 -0400 |
| commit | 74ad7994f22c6caace45034378a8cf2ce85cf10d (patch) | |
| tree | c3c67e6a682e5d0a5e3cfff0962c7dfac24c672a | |
| parent | 4bebb18889b1265c94353be0857e91911286e6de (diff) | |
| parent | 6947d26bebcbe3e6d127c9848fcf48924a125fc5 (diff) | |
| download | sdl_android-74ad7994f22c6caace45034378a8cf2ce85cf10d.tar.gz | |
Merge pull request #482 from smartdevicelink/bugfix/utest_lockScreenManagerTest
bugfix/utest_lockScreenManagerTest
| -rw-r--r-- | sdl_android/src/main/java/com/smartdevicelink/proxy/LockScreenManager.java | 14 |
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*/)
|