Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d20218e authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9232464 from 841f4d78 to tm-qpr2-release

Change-Id: Ib7ff30d3112ae7352e9d5a06afe9a85e16af4041
parents 5587d11f 841f4d78
Loading
Loading
Loading
Loading
+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) {
+4 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ import com.android.telephony.Rlog;

import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
@@ -305,6 +306,7 @@ public class TelephonyNetworkFactoryTest extends TelephonyTest {
     */
    @Test
    @SmallTest
    @Ignore("b/256052233")
    public void testRequests() throws Exception {
        mTestName = "testActive";
        final int numberOfPhones = 2;
@@ -370,6 +372,7 @@ public class TelephonyNetworkFactoryTest extends TelephonyTest {
     */
    @Test
    @SmallTest
    @Ignore("b/256052233")
    public void testHandoverNoLiveData() throws Exception {
        createMockedTelephonyComponents();
        doReturn(0).when(mSubscriptionController).getSubIdUsingPhoneId(0);
@@ -409,6 +412,7 @@ public class TelephonyNetworkFactoryTest extends TelephonyTest {
     */
    @Test
    @SmallTest
    @Ignore("b/256052233")
    public void testHandoverActivatingData() throws Exception {
        createMockedTelephonyComponents();
        doReturn(0).when(mSubscriptionController).getSubIdUsingPhoneId(0);