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

Commit 1c874a4a authored by sqian's avatar sqian
Browse files

Use deduceRestrictedCapability, removeCapability, 

 and NET_CAPABILITY_NOT_RESTRICTED instead of
 maybeMarkCapabilitiesRestricted for Mainline

Test: Treehugger; no function change
Bug: 148543040
Change-Id: I89d5c872bbae3433053265a96c93c153c8fd8a2b
parent 725fd189

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) {