From 4360a9ee8d971b6f13ec457478756191ef4f3d02 Mon Sep 17 00:00:00 2001
From: lucaslin <lucaslin@google.com>
Date: Tue, 16 Aug 2022 05:20:25 +0800
Subject: [PATCH] Replace requestNetwork with
 registerSystemDefaultNetworkCallback

Vpn used registerSystemDefaultNetworkCallback to listen the
underlying network, so the test code should also update.

Bug: 236409954
Test: atest FrameworksNetTests
Change-Id: Ide344a1bbac9d8560fbe8addac667ff5b14a4c6f
---
 tests/unit/java/com/android/server/connectivity/VpnTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/java/com/android/server/connectivity/VpnTest.java b/tests/unit/java/com/android/server/connectivity/VpnTest.java
index 041e4eacfd..caef54a7a6 100644
--- a/tests/unit/java/com/android/server/connectivity/VpnTest.java
+++ b/tests/unit/java/com/android/server/connectivity/VpnTest.java
@@ -1457,7 +1457,7 @@ public class VpnTest extends VpnTestBase {
         final ArgumentCaptor<NetworkCallback> networkCallbackCaptor =
                 ArgumentCaptor.forClass(NetworkCallback.class);
         verify(mConnectivityManager, timeout(TEST_TIMEOUT_MS))
-                .requestNetwork(any(), networkCallbackCaptor.capture());
+                .registerSystemDefaultNetworkCallback(networkCallbackCaptor.capture(), any());
 
         // onAvailable() will trigger onDefaultNetworkChanged(), so NetdUtils#setInterfaceUp will be
         // invoked. Set the return value of INetd#interfaceGetCfg to prevent NullPointerException.