Merge "Failed to show hold call when user click swap and merge simultaneously" (05a5c1f1) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -1892,6 +1892,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
		fgImsCall.merge(bgImsCall);
		} catch (ImsException e) {
		log("conference " + e.getMessage());
		handleConferenceFailed(foregroundConnection, backgroundConnection);
		}
		}

		@@ -4834,4 +4835,15 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
		public ArrayList<ImsPhoneConnection> getConnections() {
		return mConnections;
		}

		private void handleConferenceFailed(ImsPhoneConnection fgConnection,
		ImsPhoneConnection bgConnection) {
		if (fgConnection != null) {
		fgConnection.handleMergeComplete();
		}
		if (bgConnection != null) {
		bgConnection.handleMergeComplete();
		}
		mPhone.notifySuppServiceFailed(Phone.SuppService.CONFERENCE);
		}
		}