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

Commit 8d40cf43 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes If2f73495,I112651ce,Ia3a94642,I35fa1c76,Id2c5b20d, ... am: ac69f08b 

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



Change-Id: I12cb06ea2e0dab480ba975ceca65227de6efe64e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6f102e77 ac69f08b

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();