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

Commit 606b9cf0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fixed two IMS data profiles sent to modem" into tm-dev am: 3808d25d 

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



Change-Id: I5e139f4b0defd23a31e298fce3608eb6b377fd12
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8d50b4eb 3808d25d

src/java/com/android/internal/telephony/data/DataProfileManager.java

+1 −1
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ public class DataProfileManager extends Handler { 
        }



        // Check if any of the profile already supports IMS, if not, add the default one.

        DataProfile dataProfile = profiles.stream()

        dataProfile = profiles.stream()

                .filter(dp -> dp.canSatisfy(NetworkCapabilities.NET_CAPABILITY_IMS))

                .findFirst()

                .orElse(null);

tests/telephonytests/src/com/android/internal/telephony/data/DataProfileManagerTest.java

+19 −0
Original line number Diff line number Diff line
@@ -59,11 +59,13 @@ import org.junit.runner.RunWith; 
import org.mockito.ArgumentCaptor;

import org.mockito.Mockito;



import java.lang.reflect.Field;

import java.lang.reflect.Method;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;

import java.util.Objects;

import java.util.stream.Collectors;



@RunWith(AndroidTestingRunner.class)

@TestableLooper.RunWithLooper
@@ -400,6 +402,12 @@ public class DataProfileManagerTest extends TelephonyTest { 
        method.invoke(mDataProfileManagerUT, dataProfiles);

    }



    private @NonNull List<DataProfile> getAllDataProfiles() throws Exception {

        Field field = DataProfileManager.class.getDeclaredField("mAllDataProfiles");

        field.setAccessible(true);

        return (List<DataProfile>) field.get(mDataProfileManagerUT);

    }



    @Before

    public void setUp() throws Exception {

        logd("DataProfileManagerTest +Setup!");
@@ -886,4 +894,15 @@ public class DataProfileManagerTest extends TelephonyTest { 
        assertThat(mDataProfileManagerUT.isTetheringDataProfileExisting(

                TelephonyManager.NETWORK_TYPE_NR)).isFalse();

    }



    @Test

    public void testNoDefaultIms() throws Exception {

        List<DataProfile> dataProfiles = getAllDataProfiles();



        // Since the database already had IMS, there should not be default IMS created in the

        // database.

        assertThat(dataProfiles.stream()

                .filter(dp -> dp.canSatisfy(NetworkCapabilities.NET_CAPABILITY_IMS))

                .collect(Collectors.toList())).hasSize(1);

    }

}