LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Address comments on aosp/1612040." am: 0f6df3ba7d am: d0a19e01c1 am: 95340c3e69

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1ede7d126fe6a610c9c4c4dc8c631270a599d3cb
This commit is contained in:
Treehugger Robot
2021-03-04 05:08:52 +00:00
committed by Automerger Merge Worker
parent 84ebd956f9 95340c3e69
commit d758df46e8
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -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