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

Commit 311d5bc9 authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Merge "Added traffic descriptor for default data profiles" into tm-dev am:... 

Merge "Added traffic descriptor for default data profiles" into tm-dev am: 4068926f am: 8ba52ef2

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



Change-Id: I0b9c402d32b9e650363ff190e98fd5964cd64111
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a047ec18 8ba52ef2

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

+2 −0
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ public class DataProfileManager extends Handler { 
            profiles.add(new DataProfile.Builder()

                    .setApnSetting(buildDefaultApnSetting("DEFAULT IMS", "ims",

                            ApnSetting.TYPE_IMS))

                    .setTrafficDescriptor(new TrafficDescriptor("ims", null))

                    .build());

            log("Added default IMS data profile.");

        }
@@ -250,6 +251,7 @@ public class DataProfileManager extends Handler { 
            profiles.add(new DataProfile.Builder()

                    .setApnSetting(buildDefaultApnSetting("DEFAULT EIMS", "sos",

                            ApnSetting.TYPE_EMERGENCY))

                    .setTrafficDescriptor(new TrafficDescriptor("sos", null))

                    .build());

            log("Added default EIMS data profile.");

        }

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

+12 −0
Original line number Diff line number Diff line
@@ -777,4 +777,16 @@ public class DataProfileManagerTest extends TelephonyTest { 
                Telephony.Carriers.MATCH_ALL_APN_SET_ID);

        assertThat(mDataProfileManagerUT.isDataProfileValid(dataProfile)).isTrue();

    }



    @Test

    public void testDefaultEmergencyDataProfileValid() {

        TelephonyNetworkRequest tnr = new TelephonyNetworkRequest(new NetworkRequest.Builder()

                .addCapability(NetworkCapabilities.NET_CAPABILITY_EIMS)

                .build(), mPhone);

        DataProfile dataProfile = mDataProfileManagerUT.getDataProfileForNetworkRequest(

                tnr, TelephonyManager.NETWORK_TYPE_LTE);



        assertThat(dataProfile.getApn()).isEqualTo("sos");

        assertThat(dataProfile.getTrafficDescriptor().getDataNetworkName()).isEqualTo("sos");

    }

}