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

Commit 081cf7b1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Use deduceRestrictedCapability, removeCapability, and... 

Merge "Use deduceRestrictedCapability, removeCapability,  and NET_CAPABILITY_NOT_RESTRICTED instead of  maybeMarkCapabilitiesRestricted for Mainline"
parents ef36b616 1c874a4a

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

+3 −1
Original line number Diff line number Diff line
@@ -1302,7 +1302,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) {