Fix for N_SE-28854 N_SE-29290 N_SE-27358 N_SE-25429 N_SE-25498 N_SE-25689 N_SE-27155...

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

diff --git a/src/CallApp.cpp b/src/CallApp.cpp
index 4a1db2e..be2b3f3 100644 (file)
--- a/src/CallApp.cpp
+++ b/src/CallApp.cpp
@@ -348,7 +348,9 @@ CallApp::HandleDialCallAppControlRequest(RequestId reqId,const IMap* pArgsMap)
                        {
                                //KEEP "__initialSceneId" as empty and return false from "OnAppInitialized()"
                                AppLog("Terminate Phone Application");
+                               AppControlProviderManager::GetInstance()->SendAppControlResult(reqId, appControlResult, null);
                                Terminate();
+                               return;
                        }
 
                }
@@ -405,6 +407,7 @@ CallApp::HandleDialCallAppControlRequest(RequestId reqId,const IMap* pArgsMap)
                                }
                                else
                                {
+                                       AppLog("Outgoing call");
                                        pSceneManager->GoForward( ForwardSceneTransition( nextScene), __pLaunchArgs);
                                }
                                appControlResult = APP_CTRL_RESULT_SUCCEEDED;
@@ -428,7 +431,7 @@ bool
 CallApp::CheckNumberIsValid(String phoneNumber)
 {
        //Pattern to compare all characters except 0-9 * # P ; , +
-       String phoneNumberPattern(L"[^0-9*#P;,+]");
+       String phoneNumberPattern(L"[^0-9*#P,+]");
        RegularExpression checkPhoneNumber;
        checkPhoneNumber.Construct(phoneNumberPattern);
        //If there is any character other than these listed above then display invalid number
@@ -437,3 +440,28 @@ CallApp::CheckNumberIsValid(String phoneNumber)
        return !resultMatch;
 
 }
+
+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_HIGH);
+               if(PowerManager::IsScreenOn() == false)
+               {
+                       res = PowerManager::TurnScreenOn();
+               }
+               res = PowerManager::KeepScreenOnState(true,false);
+
+       }
+       else
+       {
+               GetAppFrame()->GetFrame()->SetZOrderGroup(WINDOW_Z_ORDER_GROUP_NORMAL);
+               PowerManager::KeepScreenOnState(false);
+       }
+
+}