diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-09-08 07:37:41 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-09-08 07:37:41 +0000 |
commit | bee8ebda7a5c087360d2d5cd8d5e29d4b912e0b9 (patch) | |
tree | aad104673a74dbf6b5515d177873f2d0095ef326 | |
parent | 4f89585d9a879b9da957431110aeebee4e4a02fe (diff) | |
parent | 9b1723376c2f04b30b677d94f9105220a014501e (diff) | |
download | ims-bee8ebda7a5c087360d2d5cd8d5e29d4b912e0b9.tar.gz |
release-request-8cd2a23c-f767-488e-8139-390d1636483f-for-git_oc-mr1-release-4323561 snap-temp-L80400000100600189android-wear-8.1.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-security-8.1.0_r93android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r25android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-8.1.0_r81android-8.1.0_r80android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r69android-8.1.0_r68android-8.1.0_r66android-8.1.0_r6android-8.1.0_r5android-8.1.0_r4android-8.1.0_r3android-8.1.0_r23android-8.1.0_r19android-8.1.0_r16android-8.1.0_r15android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1security-oc-mr1-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m4-s1-release
Change-Id: I2f9d33eb95868d3712e39aff7e439cb7d7a1c1f4
-rw-r--r-- | src/java/com/android/ims/ImsCall.java | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/java/com/android/ims/ImsCall.java b/src/java/com/android/ims/ImsCall.java index 716687d7..c5e6368e 100644 --- a/src/java/com/android/ims/ImsCall.java +++ b/src/java/com/android/ims/ImsCall.java @@ -1319,13 +1319,28 @@ public class ImsCall implements ICall { 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", |