Merge cherrypicks of [20181704] into tm-qpr1-release.android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-release

Change-Id: Ibd2e4c2cd9b0e3d7616eb3630ceb4198662977fb

1 files changed, 12 insertions, 13 deletions

diff --git a/src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java b/src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java
index e97882c1c5..dc41bb4f45 100644
--- a/src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java
+++ b/src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java
@@ -3385,29 +3385,28 @@ 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(),
+                mMetrics.writeOnImsCallTerminated(mPhone.getPhoneId(), imsCall.getCallSession(),
                     reasonInfo, mCallQualityMetrics.get(callId), num,
                     getNetworkCountryIso(), emergencyNumberTracker != null
-                    ? emergencyNumberTracker.getEmergencyNumberDbVersion()
-                    : TelephonyManager.INVALID_EMERGENCY_NUMBER_DB_VERSION);
-            mPhone.getVoiceCallSessionStats().onImsCallTerminated(conn, new ImsReasonInfo(
+                        ? emergencyNumberTracker.getEmergencyNumberDbVersion()
+                        : TelephonyManager.INVALID_EMERGENCY_NUMBER_DB_VERSION);
+                mPhone.getVoiceCallSessionStats().onImsCallTerminated(conn, new ImsReasonInfo(
                     maybeRemapReasonCode(reasonInfo),
                     reasonInfo.mExtraCode, reasonInfo.mExtraMessage));
-            // Remove info for the callId from the current calls and add it to the history
-            CallQualityMetrics lastCallMetrics = mCallQualityMetrics.remove(callId);
-            if (lastCallMetrics != null) {
-                mCallQualityMetricsHistory.add(lastCallMetrics);
+                // Remove info for the callId from the current calls and add it to the history
+                CallQualityMetrics lastCallMetrics = mCallQualityMetrics.remove(callId);
+                if (lastCallMetrics != null) {
+                    mCallQualityMetricsHistory.add(lastCallMetrics);
+                }
+                pruneCallQualityMetricsHistory();
             }
-            pruneCallQualityMetricsHistory();
             mPhone.notifyImsReason(reasonInfo);
 
             if (conn != null) {