diff options
| author | 2021-03-04 02:56:42 +0000 | |
|---|---|---|
| committer | 2021-03-04 02:56:42 +0000 | |
| commit | eeb8bba5f4745b77a9c10d8e782300680e0bcddf (patch) | |
| tree | 00398725964383713e4d0b55471d1b4fb6ec83db | |
| parent | 8e7a1b38d902742ca31f9877ccd8f7bb3a4fe7e0 (diff) | |
| parent | e486d38855d16215e4afa394f5b3c1b879305aec (diff) | |
Merge "Address comments on aosp/1612040." am: e486d38855
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1613962
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id3ad9eb4cf16d37cddfaece70b4f72755fd4e3a2
| -rw-r--r-- | services/core/java/com/android/server/ConnectivityService.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 40460e2c56ac..6323310374d1 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -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 |