X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2FCallActiveCallForm.cpp;h=a11ea228faf4c19c6393634e19f7f9ca8faf2c4e;hb=968ce47ae7a353e2ad110ef3b64be43d5c9b0b36;hp=d311a22fbc1271a22953bc36353dc2091a52e274;hpb=8999146614fceea4a08455c1595948c3711cdc71;p=apps%2Fosp%2FCall.git

diff --git a/src/CallActiveCallForm.cpp b/src/CallActiveCallForm.cpp
index d311a22..a11ea22 100644
--- a/src/CallActiveCallForm.cpp
+++ b/src/CallActiveCallForm.cpp
@@ -22,6 +22,7 @@
 #include <FUi.h>
 #include <FMedia.h>
 #include <FSystem.h>
+#include <FShell.h>
 #include "CallActiveCallForm.h"
 #include "CallButtonsPanel.h"
 #include "CallInfo.h"
@@ -43,6 +44,7 @@ using namespace Tizen::System;
 using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
+using namespace Tizen::Shell;
 
 //constants
 const int IDI_MAX_SECONDS = 60;
@@ -1004,6 +1006,17 @@ ActiveCallForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId&
 		break;
 	}
 
+	if(__formType == FORMTYPE_ACTIVECALL || __formType == FORMTYPE_EMERGENCYACTIVECALL ||
+			__formType == FORMTYPE_MULTIPLECALLS || __formType == FORMTYPE_ACTIVECONFCALL)
+	{
+		//Unlock the phone if its locked
+		if(LockManager::GetInstance()->IsLocked())
+		{
+			AppLogDebug("Phone Locked");
+			LockManager::GetInstance()->Unlock();
+		}
+	}
+
 	//Hide DTMFKeypad, if visible and show caller info
 	HideDTMFKeypad();
 	SetShowStateOnKeypad(true);