commit 7262180c077c311b6a127e9f3957d5647425afc8
author Remi NGUYEN VAN <reminv@google.com> Tue Aug 17 02:34:44 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 17 02:34:44 2021 +0000
tree 0453d39a768144646cc949782fa3c2189deb7938
parent b8178678df02a89fdc16f284dd80b76ff1cb3685
parent 5b8e2e9935490378dc31bc6f759c9ddbd2aee6aa

Merge "Fix NetworkCapabilities MTS on S, CTS on S+module"

framework/src/android/net/NetworkCapabilities.java

diff --git a/framework/src/android/net/NetworkCapabilities.java b/framework/src/android/net/NetworkCapabilities.java
index 5bd0af8..447f626 100644
--- a/framework/src/android/net/NetworkCapabilities.java
+++ b/framework/src/android/net/NetworkCapabilities.java
@@ -814,6 +814,19 @@
     }
 
     /**
+     * @see #restrictCapabilitiesForTestNetwork(int)
+     * @deprecated Use {@link #restrictCapabilitiesForTestNetwork(int)} (without the typo) instead.
+     * @hide
+     */
+    @Deprecated
+    public void restrictCapabilitesForTestNetwork(int creatorUid) {
+        // Do not remove without careful consideration: this method has a typo in its name but is
+        // called by the first S CTS releases, therefore it cannot be removed from the connectivity
+        // module as long as such CTS releases are valid for testing S devices.
+        restrictCapabilitiesForTestNetwork(creatorUid);
+    }
+
+    /**
      * Test networks have strong restrictions on what capabilities they can have. Enforce these
      * restrictions.
      * @hide

tests/common/java/android/net/NetworkCapabilitiesTest.java

diff --git a/tests/common/java/android/net/NetworkCapabilitiesTest.java b/tests/common/java/android/net/NetworkCapabilitiesTest.java
index 3d0cb92..382fa1f 100644
--- a/tests/common/java/android/net/NetworkCapabilitiesTest.java
+++ b/tests/common/java/android/net/NetworkCapabilitiesTest.java
@@ -75,6 +75,7 @@
 import androidx.test.runner.AndroidJUnit4;
 
 import com.android.testutils.CompatUtil;
+import com.android.testutils.ConnectivityModuleTest;
 import com.android.testutils.DevSdkIgnoreRule;
 import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
 
@@ -1168,7 +1169,7 @@
         assertEquals(0, nc.getCapabilities().length);
     }
 
-    @Test @IgnoreUpTo(Build.VERSION_CODES.R)
+    @Test @IgnoreUpTo(Build.VERSION_CODES.R) @ConnectivityModuleTest
     public void testRestrictCapabilitiesForTestNetwork() {
         final int ownerUid = 1234;
         final int[] administratorUids = {1001, ownerUid};