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

Commit 45b645b1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add enterprise id while registering network factory" into tm-dev am: 796bd232 

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



Change-Id: Iacdc1d94e7f7dc32abab269b2d6d8520402766c8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 523ab845 796bd232

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

+5 −0
Original line number Diff line number Diff line
@@ -565,6 +565,11 @@ public class PhoneSwitcher extends Handler { 
                .addCapability(NetworkCapabilities.NET_CAPABILITY_MCX)

                .addCapability(NetworkCapabilities.NET_CAPABILITY_PRIORITIZE_LATENCY)

                .addCapability(NetworkCapabilities.NET_CAPABILITY_PRIORITIZE_BANDWIDTH)

                .addEnterpriseId(NetworkCapabilities.NET_ENTERPRISE_ID_1)

                .addEnterpriseId(NetworkCapabilities.NET_ENTERPRISE_ID_2)

                .addEnterpriseId(NetworkCapabilities.NET_ENTERPRISE_ID_3)

                .addEnterpriseId(NetworkCapabilities.NET_ENTERPRISE_ID_4)

                .addEnterpriseId(NetworkCapabilities.NET_ENTERPRISE_ID_5)

                .setNetworkSpecifier(new MatchAllNetworkSpecifier());



        NetworkFactory networkFactory = new PhoneSwitcherNetworkRequestListener(looper, context,

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

+5 −0
Original line number Diff line number Diff line
@@ -167,6 +167,11 @@ public class TelephonyNetworkFactory extends NetworkFactory { 
                .addCapability(NetworkCapabilities.NET_CAPABILITY_MCX)

                .addCapability(NetworkCapabilities.NET_CAPABILITY_PRIORITIZE_LATENCY)

                .addCapability(NetworkCapabilities.NET_CAPABILITY_PRIORITIZE_BANDWIDTH)

                .addEnterpriseId(NetworkCapabilities.NET_ENTERPRISE_ID_1)

                .addEnterpriseId(NetworkCapabilities.NET_ENTERPRISE_ID_2)

                .addEnterpriseId(NetworkCapabilities.NET_ENTERPRISE_ID_3)

                .addEnterpriseId(NetworkCapabilities.NET_ENTERPRISE_ID_4)

                .addEnterpriseId(NetworkCapabilities.NET_ENTERPRISE_ID_5)

                .setNetworkSpecifier(new TelephonyNetworkSpecifier.Builder()

                .setSubscriptionId(subscriptionId).build());

        return builder.build();