release-request-8cd2a23c-f767-488e-8139-390d1636483f-for-git_oc-mr1-release-4323561 snap-temp-L80400000100600189
Change-Id: I2f9d33eb95868d3712e39aff7e439cb7d7a1c1f4
diff --git a/src/java/com/android/ims/ImsCall.java b/src/java/com/android/ims/ImsCall.java
index 716687d..c5e6368 100644
--- a/src/java/com/android/ims/ImsCall.java
+++ b/src/java/com/android/ims/ImsCall.java
@@ -1319,13 +1319,28 @@
logi("merge :: ");
synchronized(mLockObj) {
+ // If the host of the merge is in the midst of some other operation, we cannot merge.
if (mUpdateRequest != UPDATE_NONE) {
+ setCallSessionMergePending(false);
+ if (mMergePeer != null) {
+ mMergePeer.setCallSessionMergePending(false);
+ }
loge("merge :: update is in progress; request=" +
updateRequestToString(mUpdateRequest));
throw new ImsException("Call update is in progress",
ImsReasonInfo.CODE_LOCAL_ILLEGAL_STATE);
}
+ // The peer of the merge is in the midst of some other operation, we cannot merge.
+ if (mMergePeer != null && mMergePeer.mUpdateRequest != UPDATE_NONE) {
+ setCallSessionMergePending(false);
+ mMergePeer.setCallSessionMergePending(false);
+ loge("merge :: peer call update is in progress; request=" +
+ updateRequestToString(mMergePeer.mUpdateRequest));
+ throw new ImsException("Peer call update is in progress",
+ ImsReasonInfo.CODE_LOCAL_ILLEGAL_STATE);
+ }
+
if (mSession == null) {
loge("merge :: no call session");
throw new ImsException("No call session",