fix to check secured lock state before unlock, and added lock screen type(none).

Change-Id: Iec75ff59feb3762f57ecac89bbae59a3b7c8ad21
Signed-off-by: jungmin76.park <jungmin76.park@samsung.com>

diff --git a/src/core/FShell_LockManagerImpl.cpp b/src/core/FShell_LockManagerImpl.cpp
index ba0851a..e4616a1 100644 (file)
--- a/src/core/FShell_LockManagerImpl.cpp
+++ b/src/core/FShell_LockManagerImpl.cpp
@@ -98,6 +98,7 @@ _LockManagerImpl::IsSecureMode(void) const
        
        switch(screenLockType)
        {
+               case SETTING_SCREEN_LOCK_TYPE_NONE:
                case SETTING_SCREEN_LOCK_TYPE_SWIPE:
                case SETTING_SCREEN_LOCK_TYPE_MOTION:
                case SETTING_SCREEN_LOCK_TYPE_OTHER:
@@ -109,7 +110,7 @@ _LockManagerImpl::IsSecureMode(void) const
                        return true;
 
                default:
-                       SysAssert(false);
+                       SysAssertf(false, "Unknown type(%d)", screenLockType);
                        break;
        }
 
@@ -119,8 +120,11 @@ _LockManagerImpl::IsSecureMode(void) const
 result
 _LockManagerImpl::Unlock(void)
 {
+       SysTryReturnResult(NID_SHELL, !IsSecureMode(), E_INVALID_OPERATION, "Secured lock screen can't be unlocked.");
+
        if( IsLocked() == false )
        {
+               SysLog(NID_SHELL, "Lock screen is already dismissed.");
                return E_SUCCESS;
        }