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

Commit 61ab6938 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Use deduceRestrictedCapability, removeCapability, and... 

Merge "Use deduceRestrictedCapability, removeCapability,  and NET_CAPABILITY_NOT_RESTRICTED instead of  maybeMarkCapabilitiesRestricted for Mainline" am: 081cf7b1 am: 8983765b

Change-Id: Ie2c2a369b1a9624acfea0f34d0c2b5e8feb0dd2c
parents eba7eb4a 8983765b

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

+3 −1
Original line number Diff line number Diff line
@@ -1301,7 +1301,9 @@ public class DataConnection extends StateMachine { 
                result.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED);

            }



            result.maybeMarkCapabilitiesRestricted();

            if (result.deduceRestrictedCapability()) {

                result.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED);

            }

        }



        if (mRestrictedNetworkOverride) {