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

Commit 7836df02 authored by Yang Cao's avatar Yang Cao Committed by takeshi tanigawa
Browse files

Fix the forwarded number can't be displayed on in-call UI 

Extras of ImsCallProfile is purposefully restricted to simple objects
that can be safely be persisted to and restored from disk in order to
sending data between processes.
We need to handle ImsCallProfile.EXTRA_FORWARDED_NUMBER data as
string array not string array list.

Test: manual
Test: auto - Passed FrameworksTelephonyTests
Bug: 203856193

Change-Id: I3997304d52d01b2ebc931c1df9afb356dfd20465
parent 1b24a1e3

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