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

Commit fafc00ef authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Tidy up users of TRANSPORT constants." into pi-dev 

am: 407932eb

Change-Id: I31a611736b4b939edc01eb4d533a3587d3d27b76
parents 69258db6 407932eb

packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java

+3 −1
Original line number Diff line number Diff line
@@ -50,7 +50,9 @@ public class WifiStatusTracker extends ConnectivityManager.NetworkCallback { 
                }

            };

    private final NetworkRequest mNetworkRequest = new NetworkRequest.Builder()

            .clearCapabilities().addTransportType(NetworkCapabilities.TRANSPORT_WIFI).build();

            .clearCapabilities()

            .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)

            .addTransportType(NetworkCapabilities.TRANSPORT_WIFI).build();

    private final ConnectivityManager.NetworkCallback mNetworkCallback = new ConnectivityManager

            .NetworkCallback() {

        @Override

packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java

+1 −0
Original line number Diff line number Diff line
@@ -213,6 +213,7 @@ public class WifiTracker implements LifecycleObserver, OnStart, OnStop, OnDestro 


        mNetworkRequest = new NetworkRequest.Builder()

                .clearCapabilities()

                .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)

                .addTransportType(NetworkCapabilities.TRANSPORT_WIFI)

                .build();

services/core/java/com/android/server/location/GnssLocationProvider.java

+3 −3
Original line number Diff line number Diff line
@@ -2576,9 +2576,9 @@ public class GnssLocationProvider implements LocationProviderInterface { 
            // register for connectivity change events, this is equivalent to the deprecated way of

            // registering for CONNECTIVITY_ACTION broadcasts

            NetworkRequest.Builder networkRequestBuilder = new NetworkRequest.Builder();

            networkRequestBuilder.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR);

            networkRequestBuilder.addTransportType(NetworkCapabilities.TRANSPORT_WIFI);

            networkRequestBuilder.addTransportType(NetworkCapabilities.TRANSPORT_BLUETOOTH);

            networkRequestBuilder.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);

            networkRequestBuilder.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED);

            networkRequestBuilder.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN);

            NetworkRequest networkRequest = networkRequestBuilder.build();

            mConnMgr.registerNetworkCallback(networkRequest, mNetworkConnectivityCallback);

wifi/java/android/net/wifi/WifiManager.java

+1 −0
Original line number Diff line number Diff line
@@ -1317,6 +1317,7 @@ public class WifiManager { 
        if (pin) {

            NetworkRequest request = new NetworkRequest.Builder()

                    .clearCapabilities()

                    .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)

                    .addTransportType(NetworkCapabilities.TRANSPORT_WIFI)

                    .build();

            NetworkPinner.pin(mContext, request);