From 89e8793b3a6dc7193987d22637fdc96d1a53861a Mon Sep 17 00:00:00 2001
From: Benedict Wong <benedictwong@google.com>
Date: Thu, 1 Jul 2021 16:34:33 -0700
Subject: [PATCH] Request location info in UnderlyingNetworkListener

This change ensures that the UnderlyingNetworkListener receives
location-sensitive fields in order to proxy the location sensitive
fields in the VcnTransportInfo

Bug: 192587440
Test: manual tests
Test: atest FrameworksVcnTests
Change-Id: Id42ae2e373d909424c3f213412ea4731ee01fa2b
---
 .../java/com/android/server/vcn/UnderlyingNetworkTracker.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/services/core/java/com/android/server/vcn/UnderlyingNetworkTracker.java b/services/core/java/com/android/server/vcn/UnderlyingNetworkTracker.java
index ee7bf5f0d9581..3214e921e0e25 100644
--- a/services/core/java/com/android/server/vcn/UnderlyingNetworkTracker.java
+++ b/services/core/java/com/android/server/vcn/UnderlyingNetworkTracker.java
@@ -460,6 +460,10 @@ public class UnderlyingNetworkTracker {
         private final Map<Network, UnderlyingNetworkRecord.Builder>
                 mUnderlyingNetworkRecordBuilders = new ArrayMap<>();
 
+        UnderlyingNetworkListener() {
+            super(NetworkCallback.FLAG_INCLUDE_LOCATION_INFO);
+        }
+
         private TreeSet<UnderlyingNetworkRecord> getSortedUnderlyingNetworks() {
             TreeSet<UnderlyingNetworkRecord> sorted =
                     new TreeSet<>(