Merge "Create service-connectivity.jar"

2020-10-20 06:09:41 +00:00
parent 5dbc2cd15d 944025aef2
commit bfceacea50
11 changed files with 166 additions and 18 deletions
--- a/tests/net/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java
@@ -1246,7 +1246,7 @@ public class ConnectivityServiceTest {
        // Create local CM before sending system ready so that we can answer
        // getSystemService() correctly.
        mCm = new WrappedConnectivityManager(InstrumentationRegistry.getContext(), mService);
-        mService.systemReady();
+        mService.systemReadyInternal();
        mockVpn(Process.myUid());
        mCm.bindProcessToNetwork(null);