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

Commit eee631bc authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

Address comments on aosp/1612040. 

Bug: 174123988
Test: atest FrameworksNetTests
Change-Id: I550fe428d640aab6264aface21fbafb1fd268bff
parent 1881ae03

services/core/java/com/android/server/ConnectivityService.java

+4 −1
Original line number Diff line number Diff line
@@ -1480,7 +1480,10 @@ public class ConnectivityService extends IConnectivityManager.Stub 
    @NonNull

    private NetworkInfo filterNetworkInfo(@NonNull NetworkInfo networkInfo, int type,

            @NonNull NetworkCapabilities nc, int uid, boolean ignoreBlocked) {

        NetworkInfo filtered = new NetworkInfo(networkInfo);

        final NetworkInfo filtered = new NetworkInfo(networkInfo);

        // Many legacy types (e.g,. TYPE_MOBILE_HIPRI) are not actually a property of the network

        // but only exists if an app asks about them or requests them. Ensure the requesting app

        // gets the type it asks for.

        filtered.setType(type);

        final DetailedState state = isNetworkWithCapabilitiesBlocked(nc, uid, ignoreBlocked)

                ? DetailedState.BLOCKED