Merge "Use actual Wifi subId when applying Network policies." into sc-dev

2021-03-08 20:29:07 +00:00
parent b28ad521cf b3f02d1774
commit 061b3bd32b
1 changed files with 1 additions and 2 deletions
--- 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. */