From b3f02d1774d26da8062c0bd82ebfe66b9e7b1181 Mon Sep 17 00:00:00 2001 From: Cody Kesting Date: Thu, 4 Mar 2021 10:50:02 -0800 Subject: [PATCH] Use actual Wifi subId when applying Network policies. This CL updates Network policy application to check against a Wifi Network's actual subscription id (previously, all Wifi Networks appeared to have subId INVALID_SUBSCRIPTION). Bug: 178501049 Test: atest FrameworksVcnTests Change-Id: I83f51e3351940bbb791bcc40bc75fe04baf68171 --- .../core/java/com/android/server/VcnManagementService.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/VcnManagementService.java b/services/core/java/com/android/server/VcnManagementService.java index ad2f52401e931..f73c9a262074e 100644 --- a/services/core/java/com/android/server/VcnManagementService.java +++ b/services/core/java/com/android/server/VcnManagementService.java @@ -314,8 +314,7 @@ public class VcnManagementService extends IVcnManagementService.Stub { /** Gets the subId indicated by the given {@link WifiInfo}. */ public int getSubIdForWifiInfo(@NonNull WifiInfo wifiInfo) { - // TODO(b/178501049): use the subId indicated by WifiInfo#getSubscriptionId - return SubscriptionManager.INVALID_SUBSCRIPTION_ID; + return wifiInfo.getSubscriptionId(); } /** Creates a new LocationPermissionChecker for the provided Context. */