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

Commit 7f847ee8 authored by Amit Mahajan's avatar Amit Mahajan Committed by Gerrit Code Review
Browse files

Merge "Adding new APN type for Mission Critical Services."

parents e01ce3f0 93e43c50

src/java/com/android/internal/telephony/PhoneSwitcher.java

+1 −0
Original line number Diff line number Diff line
@@ -258,6 +258,7 @@ public class PhoneSwitcher extends Handler { 
        netCap.addCapability(NetworkCapabilities.NET_CAPABILITY_EIMS);

        netCap.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED);

        netCap.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);

        netCap.addCapability(NetworkCapabilities.NET_CAPABILITY_MCX);

        netCap.setNetworkSpecifier(new MatchAllNetworkSpecifier());



        NetworkFactory networkFactory = new PhoneSwitcherNetworkRequestListener(looper, context,

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

+4 −0
Original line number Diff line number Diff line
@@ -625,6 +625,10 @@ public class ApnContext { 
            if (apnType != ApnSetting.TYPE_NONE) error = true;

            apnType = ApnSetting.TYPE_EMERGENCY;

        }

        if (nc.hasCapability(NetworkCapabilities.NET_CAPABILITY_MCX)) {

            if (apnType != ApnSetting.TYPE_NONE) error = true;

            apnType = ApnSetting.TYPE_MCX;

        }

        if (error) {

            // TODO: If this error condition is removed, the framework's handling of

            // NET_CAPABILITY_NOT_RESTRICTED will need to be updated so requests for

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

+4 −0
Original line number Diff line number Diff line
@@ -1125,6 +1125,10 @@ public class DataConnection extends StateMachine { 
                        result.addCapability(NetworkCapabilities.NET_CAPABILITY_EIMS);

                        break;

                    }

                    case PhoneConstants.APN_TYPE_MCX: {

                        result.addCapability(NetworkCapabilities.NET_CAPABILITY_MCX);

                        break;

                    }

                    default:

                }

            }