commit 3dd5cc163133b51a1f27931a7fa94823ce7ff3a1
author Patrick Rohr <prohr@google.com> Tue Feb 22 20:43:22 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 22 20:43:22 2022 +0000
tree 59efc92fc60f3466430bb7e6da8acc80f390f2ee
parent b30e9577774a061415b109c75a23bbd977097ab7
parent 2140575fce22765dd7dad2e9d0cdd3f9add1d570

Merge "Add proper kernel support assumption to RateLimitTest"

tests/cts/net/src/android/net/cts/EthernetNetworkSpecifierTest.java

diff --git a/tests/cts/net/src/android/net/cts/EthernetNetworkSpecifierTest.java b/tests/cts/net/src/android/net/cts/EthernetNetworkSpecifierTest.java
index 5bde8c8..ef8fd1a 100644
--- a/tests/cts/net/src/android/net/cts/EthernetNetworkSpecifierTest.java
+++ b/tests/cts/net/src/android/net/cts/EthernetNetworkSpecifierTest.java
@@ -16,13 +16,12 @@
 
 package android.net.cts;
 
-import static com.android.testutils.DevSdkIgnoreRuleKt.SC_V2;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertThrows;
 
 import android.net.EthernetNetworkSpecifier;
+import android.os.Build;
 
 import androidx.test.filters.SmallTest;
 
@@ -33,7 +32,7 @@
 import org.junit.runner.RunWith;
 
 @SmallTest
-@IgnoreUpTo(SC_V2) // TODO: Use to Build.VERSION_CODES.SC_V2 when available
+@IgnoreUpTo(Build.VERSION_CODES.R)
 @RunWith(DevSdkIgnoreRunner.class)
 public class EthernetNetworkSpecifierTest {
 

tests/unit/java/com/android/server/ConnectivityServiceTest.java

diff --git a/tests/unit/java/com/android/server/ConnectivityServiceTest.java b/tests/unit/java/com/android/server/ConnectivityServiceTest.java
index d5f1516..8ec6257 100644
--- a/tests/unit/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/unit/java/com/android/server/ConnectivityServiceTest.java
@@ -925,6 +925,7 @@
                 return null;
             };
 
+            doAnswer(validateAnswer).when(mNetworkMonitor).notifyNetworkConnected(any(), any());
             doAnswer(validateAnswer).when(mNetworkMonitor).notifyNetworkConnectedParcel(any());
             doAnswer(validateAnswer).when(mNetworkMonitor).forceReevaluation(anyInt());