Nabi fixes for RC25

[apps/osp/Call.git] / src / CallApp.cpp

diff --git a/src/CallApp.cpp b/src/CallApp.cpp
index 31f7f52..540f193 100644 (file)
--- a/src/CallApp.cpp
+++ b/src/CallApp.cpp
@@ -538,6 +538,7 @@ void
 CallApp::SetTopMostWindow(bool bTopMost)
 {
        AppLogDebug("bTopMost = %d",bTopMost);
+       result res = E_FAILURE;
        //ToDO: Need to see if there is better way to handle
        //this case
 
@@ -545,6 +546,12 @@ CallApp::SetTopMostWindow(bool bTopMost)
        {
                GetAppFrame()->GetFrame()->SetZOrderGroup(WINDOW_Z_ORDER_GROUP_HIGHEST);
                AppManager::GetInstance()->AddActiveAppEventListener(*this);
+               if(PowerManager::IsScreenOn() == false)
+               {
+                       AppLogDebug("TurnScreenOn");
+                       res = PowerManager::TurnScreenOn();
+                       AppLogDebug("TurnScreenOn %d",res);
+               }
 
        }
        else
@@ -554,25 +561,22 @@ CallApp::SetTopMostWindow(bool bTopMost)
                AppManager::GetInstance()->RemoveActiveAppEventListener(*this);
        }
 
+       if(LockManager::GetInstance()->IsLocked())
+       {
+               AppLogDebug("Phone Locked");
+               LockManager::GetInstance()->Unlock();
+       }
 
 }
 void
 CallApp::OnActiveAppChanged(const String& appId)
 {
-       result res = E_FAILURE;
        AppLogDebug("Enter %ls",appId.GetPointer());
        if(GetAppId().Equals(appId) == true)
        {
-               if(PowerManager::IsScreenOn() == false)
-               {
-                       AppLogDebug("TurnScreenOn");
-                       res = PowerManager::TurnScreenOn();
-                       AppLogDebug("TurnScreenOn %d",res);
-               }
                result res = PowerManager::KeepScreenOnState(true,false);
                AppLogDebug("KeepScreenOnState %d",res);
 
-
        }
 
 }