diff options
| author | 2021-03-04 05:08:52 +0000 | |
|---|---|---|
| committer | 2021-03-04 05:08:52 +0000 | |
| commit | d10c8129a3721a3a5fb30f4ba211a1330692d437 (patch) | |
| tree | a188b3f0768295a2c14101c7777e20bff6aeb905 | |
| parent | f0c81356f4e765dce4b92762b1fbe4406dfe9903 (diff) | |
| parent | f9d49a8a111383df943d2d4f6ceab51f6be4fff2 (diff) | |
Merge "Address comments on aosp/1612040." am: e486d38855 am: eeb8bba5f4 am: f9d49a8a11
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1613962
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1ede7d126fe6a610c9c4c4dc8c631270a599d3cb
| -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 |