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

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

Merge "Adding new APN type for Mission Critical Services." am: 7f847ee8 am: f0df719e 

am: 4f824267

Change-Id: I30b22900a15388483779fe294f0c3750cdf7fece
parents 52bea6b2 4f824267

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

+1 −0
Original line number Diff line number Diff line
@@ -297,6 +297,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
@@ -1126,6 +1126,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:

                }

            }