Fix for 37272 37208 37254

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

diff --git a/src/CallApp.cpp b/src/CallApp.cpp
index 714b8ca..31f7f52 100644 (file)
--- a/src/CallApp.cpp
+++ b/src/CallApp.cpp
@@ -425,6 +425,12 @@ CallApp::HandleDialCallAppControlRequest(RequestId reqId,const IMap* pArgsMap,co
                                Terminate();
                                return;
                        }
+                       else
+                       {
+                               //invalid phone number.always return, but App will come to foreground
+                               //and show current screen, if any calls is present.
+                               return;
+                       }
                }
                //call type
                pKey = new (std::nothrow) String(PARAM_CALL_TYPE);
@@ -532,19 +538,12 @@ 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
 
        if(bTopMost == true)
        {
                GetAppFrame()->GetFrame()->SetZOrderGroup(WINDOW_Z_ORDER_GROUP_HIGHEST);
-               if(PowerManager::IsScreenOn() == false)
-               {
-                       AppLogDebug("TurnScreenOn");
-                       res = PowerManager::TurnScreenOn();
-                       AppLogDebug("TurnScreenOn %d",res);
-               }
                AppManager::GetInstance()->AddActiveAppEventListener(*this);
 
        }
@@ -554,20 +553,22 @@ CallApp::SetTopMostWindow(bool bTopMost)
                PowerManager::KeepScreenOnState(false);
                AppManager::GetInstance()->RemoveActiveAppEventListener(*this);
        }
-       //Unlock the phone if its locked
-/*     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);