X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2FCallApp.cpp;h=540f193716a8b3e15e591b51e4b319d9b900decf;hb=e957f280f9553acf9d1418818f24b1df77a72e3d;hp=31f7f52fe6e29028d11d6b147495b2ab509263ed;hpb=6a3ed04a7ca44470fdfeb8f35980f99eab5314b2;p=apps%2Fosp%2FCall.git

diff --git a/src/CallApp.cpp b/src/CallApp.cpp
index 31f7f52..540f193 100644
--- 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);
 
-
 	}
 
 }