Fix for 42792
authorAmith Kumar Mahale <amith.m@samsung.com>
Tue, 25 Jun 2013 07:53:51 +0000 (13:23 +0530)
committerAmith Kumar Mahale <amith.m@samsung.com>
Tue, 25 Jun 2013 07:53:51 +0000 (13:23 +0530)
Change-Id: I3e6c1d17d88cf5c3327ba683c4a110f55fc66ca1
Signed-off-by: Amith Kumar Mahale <amith.m@samsung.com>
src/CallTelephonyManager.cpp

index f05ad00..b057fbe 100644 (file)
@@ -1990,15 +1990,18 @@ TelephonyManager::HandleEndNormalActiveCall(AppCallInfo& endCallInfo)
                }
                else
                {
-                       //fetch active calls to show appropriate scene
-                       pCallList = static_cast<ArrayListT<AppCallInfo>*>(__pActiveCallList->GetValuesN());
-                       //fetch the held call on disconnecting the active call and activate it.
-                       r = pCallList->GetAt(0, heldCall);
-                       if (r == E_SUCCESS)
+                       if(__pIncomingCall == null)
                        {
-                               HoldActiveCall(&heldCall, false);
-                               delete pCallList;
+                               //fetch active calls to show appropriate scene
                                pCallList = static_cast<ArrayListT<AppCallInfo>*>(__pActiveCallList->GetValuesN());
+                               //fetch the held call on disconnecting the active call and activate it.
+                               r = pCallList->GetAt(0, heldCall);
+                               if (r == E_SUCCESS)
+                               {
+                                       HoldActiveCall(&heldCall, false);
+                                       delete pCallList;
+                                       pCallList = static_cast<ArrayListT<AppCallInfo>*>(__pActiveCallList->GetValuesN());
+                               }
                        }
                }