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

Commit c19462e1 authored by Amit Mahajan's avatar Amit Mahajan Committed by android-build-merger
Browse files

Merge "Add DUN as a NetworkCapability if current APN is the DUN APN as well." am: d33414fb 

am: c36d61b9

Change-Id: Ib108c095c7a9440578b572660ff209b9f9113fe1
parents 43b70eb6 c36d61b9

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

+6 −1
Original line number Diff line number Diff line
@@ -865,6 +865,7 @@ public class DataConnection extends StateMachine { 
        result.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR);



        if (mApnSetting != null) {

            ApnSetting securedDunApn = mDct.fetchDunApn();

            for (String type : mApnSetting.types) {

                if (!mRestrictedNetworkOverride

                        && (mConnectionParams != null && mConnectionParams.mUnmeteredUseOnly)
@@ -881,6 +882,11 @@ public class DataConnection extends StateMachine { 
                        result.addCapability(NetworkCapabilities.NET_CAPABILITY_IMS);

                        result.addCapability(NetworkCapabilities.NET_CAPABILITY_CBS);

                        result.addCapability(NetworkCapabilities.NET_CAPABILITY_IA);

                        // check if this is the DUN apn as well as returned by fetchDunApn().

                        // If yes, add DUN capability too.

                        if (mApnSetting.equals(securedDunApn)) {

                            result.addCapability(NetworkCapabilities.NET_CAPABILITY_DUN);

                        }

                        break;

                    }

                    case PhoneConstants.APN_TYPE_DEFAULT: {
@@ -896,7 +902,6 @@ public class DataConnection extends StateMachine { 
                        break;

                    }

                    case PhoneConstants.APN_TYPE_DUN: {

                        ApnSetting securedDunApn = mDct.fetchDunApn();

                        if (securedDunApn == null || securedDunApn.equals(mApnSetting)) {

                            result.addCapability(NetworkCapabilities.NET_CAPABILITY_DUN);

                        }