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

Commit e06e36bf authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

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

am: 19191f37

Change-Id: I1b5343e11280686d9947d18cd683b99bfd2b5f55
parents 40edfa4f 19191f37

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

+4 −3
Original line number Diff line number Diff line
@@ -865,11 +865,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);