Merge "Move NetworkAgent#register to a new method."

2020-03-03 03:37:07 +00:00
parent fcca217a94 5863a71547
commit 5d61bc285d
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);