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

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

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id3ad9eb4cf16d37cddfaece70b4f72755fd4e3a2
parents 8e7a1b38 e486d388

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

+4 −1
Original line number Diff line number Diff line
@@ -1478,7 +1478,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