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

Commit 3bb91399 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Replace setCapability usage in Tethering" am: ab9527a4 am: 751ff753 

Change-Id: I4d71bd58f18f283318e039cbf56ef8be5ede7712
parents e995e98d 751ff753

packages/Tethering/src/com/android/server/connectivity/tethering/UpstreamNetworkMonitor.java

+18 −7
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ import static android.net.ConnectivityManager.TYPE_MOBILE_DUN; 
import static android.net.ConnectivityManager.TYPE_MOBILE_HIPRI;

import static android.net.ConnectivityManager.TYPE_WIFI;

import static android.net.NetworkCapabilities.NET_CAPABILITY_DUN;

import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET;

import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED;

import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_VPN;

import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;
@@ -215,19 +217,28 @@ public class UpstreamNetworkMonitor { 
            mLog.e("registerMobileNetworkRequest() already registered");

            return;

        }

        // The following use of the legacy type system cannot be removed until

        // after upstream selection no longer finds networks by legacy type.

        // See also http://b/34364553 .

        final int legacyType = mDunRequired ? TYPE_MOBILE_DUN : TYPE_MOBILE_HIPRI;



        final NetworkRequest mobileUpstreamRequest = new NetworkRequest.Builder()

                .setCapabilities(networkCapabilitiesForType(legacyType))

                .build();

        final NetworkRequest mobileUpstreamRequest;

        if (mDunRequired) {

            mobileUpstreamRequest = new NetworkRequest.Builder()

                    .addCapability(NET_CAPABILITY_DUN)

                    .removeCapability(NET_CAPABILITY_NOT_RESTRICTED)

                    .addTransportType(TRANSPORT_CELLULAR).build();

        } else {

            mobileUpstreamRequest = new NetworkRequest.Builder()

                    .addCapability(NET_CAPABILITY_INTERNET)

                    .addTransportType(TRANSPORT_CELLULAR).build();

        }



        // The existing default network and DUN callbacks will be notified.

        // Therefore, to avoid duplicate notifications, we only register a no-op.

        mMobileNetworkCallback = new UpstreamNetworkCallback(CALLBACK_MOBILE_REQUEST);



        // The following use of the legacy type system cannot be removed until

        // upstream selection no longer finds networks by legacy type.

        // See also http://b/34364553 .

        final int legacyType = mDunRequired ? TYPE_MOBILE_DUN : TYPE_MOBILE_HIPRI;



        // TODO: Change the timeout from 0 (no onUnavailable callback) to some

        // moderate callback timeout. This might be useful for updating some UI.

        // Additionally, we log a message to aid in any subsequent debugging.