Merge "Move NetworkAgent#register to a new method." am: 5d61bc285d am: 7c9677256c

Change-Id: I069ef3b6573bcb4377c730097c73e153d2ab4df1
2020-03-03 04:08:58 +00:00
parent 2da8f12741 7c9677256c
commit 00f91b0996
4 changed files with 62 additions and 17 deletions
--- a/tests/net/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java
@@ -647,7 +647,7 @@ public class ConnectivityServiceTest {
                }
            };

-            assertEquals(na.network.netId, nmNetworkCaptor.getValue().netId);
+            assertEquals(na.getNetwork().netId, nmNetworkCaptor.getValue().netId);
            mNmCallbacks = nmCbCaptor.getValue();

            mNmCallbacks.onNetworkMonitorCreated(mNetworkMonitor);