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

Commit d10c8129 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Address comments on aosp/1612040." am: e486d388 am: eeb8bba5 am: f9d49a8a 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1613962

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1ede7d126fe6a610c9c4c4dc8c631270a599d3cb
parents f0c81356 f9d49a8a

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

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

    @NonNull

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

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

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

            @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);

        filtered.setType(type);

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

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

                ? DetailedState.BLOCKED

                ? DetailedState.BLOCKED