From 3656709632aa79e75df51c435506eeed7fd094a7 Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Wed, 3 Mar 2021 14:39:04 +0900 Subject: [PATCH] Address comments on aosp/1612040. Bug: 174123988 Test: atest FrameworksNetTests Change-Id: I550fe428d640aab6264aface21fbafb1fd268bff --- .../core/java/com/android/server/ConnectivityService.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 93fab6e459..92f32effe3 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -1480,7 +1480,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