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

Commit 98c899e1 authored by Paul Jensen's avatar Paul Jensen Committed by Android Git Automerger
Browse files

am 1caf59d4: Merge "Fix NOT_RESTRICTED network capability and enforce it." into mnc-dev 

* commit '1caf59d4':
  Fix NOT_RESTRICTED network capability and enforce it.
parents 2d8e12fe 1caf59d4

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

+1 −1
Original line number Diff line number Diff line
@@ -963,7 +963,7 @@ public final class DataConnection extends StateMachine { 
                    default:

                }

            }

            ConnectivityManager.maybeMarkCapabilitiesRestricted(result);

            result.maybeMarkCapabilitiesRestricted();

        }

        int up = 14;

        int down = 14;

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

+4 −0
Original line number Diff line number Diff line
@@ -599,6 +599,10 @@ public class DctController extends Handler { 
            type = ConnectivityManager.TYPE_MOBILE_EMERGENCY;

        }

        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

            // say FOTA and INTERNET are marked as restricted.  This is not how

            // NetworkCapabilities.maybeMarkCapabilitiesRestricted currently works.

            loge("Multiple apn types specified in request - result is unspecified!");

        }

        if (type == -1 || name == null) {