diff options
| author | Anju Mathapati <anjucm@codeaurora.org> | 2015-09-25 14:49:38 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-10-12 16:11:42 -0700 |
| commit | 14a5b1d6b5b806ccf6e27717833683124e0e7398 (patch) | |
| tree | 6ac62ac9f685b2f60ef27299d4988b0ab5f191d6 | |
| parent | a763df74ca2e52f4976221b82f77fd99878fc2de (diff) | |
| download | android_frameworks_opt_net_ims-14a5b1d6b5b806ccf6e27717833683124e0e7398.tar.gz android_frameworks_opt_net_ims-14a5b1d6b5b806ccf6e27717833683124e0e7398.tar.bz2 android_frameworks_opt_net_ims-14a5b1d6b5b806ccf6e27717833683124e0e7398.zip | |
IMS: Dont clean merge info on host termination
When merge is initiated & user triggers hangup
we should process hangup only for the active call.
States & Conference information should be cleaned up
only after we receive conference response.
Change-Id: I0213e434f30e705c2f23ac2fb0c127b015da56da
| -rw-r--r-- | src/java/com/android/ims/ImsCall.java | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/java/com/android/ims/ImsCall.java b/src/java/com/android/ims/ImsCall.java index b1b8a44..0bbdfa1 100644 --- a/src/java/com/android/ims/ImsCall.java +++ b/src/java/com/android/ims/ImsCall.java @@ -1666,9 +1666,6 @@ public class ImsCall implements ICall { mSessionEndDuringMerge = true; mSessionEndDuringMergeReasonInfo = reasonInfo; return; - } else if (mTerminationRequestPending) { - // Abort the merge if we receive a termination request from telephony or the user. - clearMergeInfo(); } // If we are terminating the conference call, notify using conference listeners. |