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

Commit 19191f37 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Only tearing down restricted metered data when data is enabled"

parents 69614c66 e5c00a1d

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

+4 −3
Original line number Diff line number Diff line
@@ -856,11 +856,12 @@ public class DcTracker extends Handler { 
                    if (dcac != null) {

                        final NetworkCapabilities netCaps = dcac.getNetworkCapabilitiesSync();

                        if (netCaps != null && !netCaps.hasCapability(NetworkCapabilities

                                .NET_CAPABILITY_NOT_RESTRICTED)) {

                                .NET_CAPABILITY_NOT_RESTRICTED) && !netCaps.hasCapability(

                                NetworkCapabilities.NET_CAPABILITY_NOT_METERED)) {

                            if (DBG) {

                                log("Tearing down restricted net:" + apnContext);

                                log("Tearing down restricted metered net:" + apnContext);

                            }

                            // Tearing down the restricted data call (metered or unmetered) when

                            // Tearing down the restricted metered data call when

                            // conditions change. This will allow reestablishing a new unrestricted

                            // data connection.

                            apnContext.setReason(Phone.REASON_DATA_ENABLED);