| commit | d0a19e01c158ac71935f8c7f515a340becc9c41a | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Mar 04 02:56:42 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 04 02:56:42 2021 +0000 |
| tree | f0491d9978cbcd6cdf6c2059847a1ceef4379c92 | |
| parent | c5ed4d81244ae79f33bc814b3429809d8f281331 [diff] | |
| parent | 0f6df3ba7d49c4369ee887c666906a878d8785d1 [diff] |
Merge "Address comments on aosp/1612040." am: 0f6df3ba7d Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1613962 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id3ad9eb4cf16d37cddfaece70b4f72755fd4e3a2
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