Merge cherrypicks of [20181704] into tm-qpr1-release. (35c611c3) · Commits · e / os / android_frameworks_opt_telephony

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

+12 −13

Original line number	Diff line number	Diff line
		@@ -3385,15 +3385,13 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
		cause = DisconnectCause.IMS_MERGED_SUCCESSFULLY;
		}

		String callId = imsCall.getSession().getCallId();
		EmergencyNumberTracker emergencyNumberTracker = null;
		EmergencyNumber num = null;

		if (conn != null) {
		if (conn != null && imsCall.getSession() != null) {
		String callId = imsCall.getSession().getCallId();
		emergencyNumberTracker = conn.getEmergencyNumberTracker();
		num = conn.getEmergencyNumberInfo();
		}

		mMetrics.writeOnImsCallTerminated(mPhone.getPhoneId(), imsCall.getCallSession(),
		reasonInfo, mCallQualityMetrics.get(callId), num,
		getNetworkCountryIso(), emergencyNumberTracker != null
		@@ -3408,6 +3406,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
		mCallQualityMetricsHistory.add(lastCallMetrics);
		}
		pruneCallQualityMetricsHistory();
		}
		mPhone.notifyImsReason(reasonInfo);

		if (conn != null) {