| commit | d758df46e885c060314456ee448d181e96677bb6 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Mar 04 05:08:52 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 04 05:08:52 2021 +0000 |
| tree | 9eea80ac157c47d59efa635268eb373003f79190 | |
| parent | 84ebd956f961ef26d22d8164fcf7758a99ec2989 [diff] | |
| parent | 95340c3e69806bb30fe906227f41c7502f23ca1a [diff] |
Merge "Address comments on aosp/1612040." am: 0f6df3ba7d am: d0a19e01c1 am: 95340c3e69 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1613962 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1ede7d126fe6a610c9c4c4dc8c631270a599d3cb
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 40460e2..6323310 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -1478,7 +1478,10 @@ @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