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

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

Merge "[VCN07.5] Add NOT_VCN_MANAGED for NetworkAgent implementations" am:... 

Merge "[VCN07.5] Add NOT_VCN_MANAGED for NetworkAgent implementations" am: 422906bc am: 6285bcd7

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I555355d9e635aba185ca4efab0b8f83ef88204b9
parents 96773a59 6285bcd7

src/java/com/android/internal/telephony/dataconnection/DataConnection.java

+1 −0
Original line number Diff line number Diff line
@@ -1765,6 +1765,7 @@ public class DataConnection extends StateMachine { 
        }



        result.setCapability(NetworkCapabilities.NET_CAPABILITY_NOT_SUSPENDED, !mIsSuspended);

        result.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VCN_MANAGED);



        result.setAdministratorUids(mAdministratorUids);

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

+1 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ public class TelephonyNetworkFactory extends NetworkFactory { 
        nc.addCapability(NetworkCapabilities.NET_CAPABILITY_XCAP);

        nc.addCapability(NetworkCapabilities.NET_CAPABILITY_EIMS);

        nc.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED);

        nc.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VCN_MANAGED);

        nc.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);

        nc.setNetworkSpecifier(new TelephonyNetworkSpecifier.Builder()

                .setSubscriptionId(subscriptionId).build());