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

Commit db176af6 authored by Brad Ebinger's avatar Brad Ebinger Committed by Automerger Merge Worker
Browse files

Merge "Fix the forwarded number can't be displayed on in-call UI" am: a8209d33 am: 6258068a 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1867844

Change-Id: I414f101d7812b1d056b069c4d7190e2591a7df1b
parents 5e9a429a 6258068a

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

+7 −1
Original line number Diff line number Diff line
@@ -59,6 +59,8 @@ import com.android.internal.telephony.emergency.EmergencyNumberTracker; 
import com.android.internal.telephony.metrics.TelephonyMetrics;

import com.android.telephony.Rlog;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collections;

import java.util.Objects;

import java.util.Set;
@@ -1318,7 +1320,11 @@ public class ImsPhoneConnection extends Connection implements 
            return;

        }

        if (extras.containsKey(ImsCallProfile.EXTRA_FORWARDED_NUMBER)) {

            mForwardedNumber = extras.getStringArrayList(ImsCallProfile.EXTRA_FORWARDED_NUMBER);

            String[] forwardedNumberArray =

                    extras.getStringArray(ImsCallProfile.EXTRA_FORWARDED_NUMBER);

            if (forwardedNumberArray != null) {

                mForwardedNumber = new ArrayList<String>(Arrays.asList(forwardedNumberArray));

            }

        }

    }

tests/telephonytests/src/com/android/internal/telephony/imsphone/ImsPhoneConnectionTest.java

+6 −6
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ import org.mockito.stubbing.Answer; 


import java.lang.reflect.Field;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.concurrent.CountDownLatch;

import java.util.concurrent.TimeUnit;
@@ -433,15 +434,14 @@ public class ImsPhoneConnectionTest extends TelephonyTest { 
    @SmallTest

    public void testSetRedirectingAddress() {

        mConnectionUT = new ImsPhoneConnection(mImsPhone, mImsCall, mImsCT, mForeGroundCall, false);

        ArrayList<String> forwardedNumber = new ArrayList<String>();

        forwardedNumber.add("11111");

        forwardedNumber.add("22222");

        forwardedNumber.add("33333");

        String[] forwardedNumber = new String[]{"11111", "22222", "33333"};

        ArrayList<String> forwardedNumberList =

                new ArrayList<String>(Arrays.asList(forwardedNumber));



        assertEquals(mConnectionUT.getForwardedNumber(), null);

        mBundle.putStringArrayList(ImsCallProfile.EXTRA_FORWARDED_NUMBER, forwardedNumber);

        mBundle.putStringArray(ImsCallProfile.EXTRA_FORWARDED_NUMBER, forwardedNumber);

        assertTrue(mConnectionUT.update(mImsCall, Call.State.ACTIVE));

        assertEquals(forwardedNumber, mConnectionUT.getForwardedNumber());

        assertEquals(forwardedNumberList, mConnectionUT.getForwardedNumber());

    }



    @Test