commit dd2dd2baa2a152aea23d363035b37055728514d9
author Treehugger Robot <treehugger-gerrit@google.com> Wed Sep 21 12:24:28 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 21 12:24:28 2022 +0000
tree 55f7e52949136610d9a842f0071d342f0f988a36
parent 3dca00e965a78d6f966bb8cfd79c53109aaafa5b
parent f11ed8c6990bd047aa32c93365de733c8737a400

Merge "Start listening to telephony changes in #start()"

OWNERS_core_networking_xts

diff --git a/OWNERS_core_networking_xts b/OWNERS_core_networking_xts
index 59d6575..dc92788 100644
--- a/OWNERS_core_networking_xts
+++ b/OWNERS_core_networking_xts
@@ -4,4 +4,8 @@
 # For cherry-picks of CLs that are already merged in aosp/master.
 jchalard@google.com #{LAST_RESORT_SUGGESTION}
 maze@google.com #{LAST_RESORT_SUGGESTION}
-reminv@google.com #{LAST_RESORT_SUGGESTION}
\ No newline at end of file
+reminv@google.com #{LAST_RESORT_SUGGESTION}
+
+# Only temporary ownership to improve ethernet code quality (b/236280707)
+# TODO: remove by 12/31/2022
+per-file EthernetManagerTest.java = prohr@google.com #{LAST_RESORT_SUGGESTION}
\ No newline at end of file

Tethering/tests/integration/src/android/net/EthernetTetheringTest.java

diff --git a/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java b/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java
index 43aff7e..2dcf9d7 100644
--- a/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java
+++ b/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java
@@ -1943,7 +1943,9 @@
                 tester, false /* isClat */);
     }
 
+    // TODO: support R device. See b/234727688.
     @Test
+    @IgnoreUpTo(Build.VERSION_CODES.R)
     public void testTetherClatTcp() throws Exception {
         // CLAT only starts on IPv6 only network.
         final TetheringTester tester = initTetheringTester(toList(TEST_IP6_ADDR),

tests/unit/java/com/android/server/connectivity/VpnTest.java

diff --git a/tests/unit/java/com/android/server/connectivity/VpnTest.java b/tests/unit/java/com/android/server/connectivity/VpnTest.java
index 795eb47..0abcfc5 100644
--- a/tests/unit/java/com/android/server/connectivity/VpnTest.java
+++ b/tests/unit/java/com/android/server/connectivity/VpnTest.java
@@ -944,12 +944,15 @@
     @Test
     public void testSetAndGetAppExclusionListRestrictedUser() throws Exception {
         final Vpn vpn = prepareVpnForVerifyAppExclusionList();
+
         // Mock it to restricted profile
         when(mUserManager.getUserInfo(anyInt())).thenReturn(RESTRICTED_PROFILE_A);
+
         // Restricted users cannot configure VPNs
         assertThrows(SecurityException.class,
                 () -> vpn.setAppExclusionList(TEST_VPN_PKG, new ArrayList<>()));
-        assertThrows(SecurityException.class, () -> vpn.getAppExclusionList(TEST_VPN_PKG));
+
+        assertEquals(Arrays.asList(PKGS), vpn.getAppExclusionList(TEST_VPN_PKG));
     }
 
     @Test

tools/Android.bp

diff --git a/tools/Android.bp b/tools/Android.bp
index 7d6b248..3ce76f6 100644
--- a/tools/Android.bp
+++ b/tools/Android.bp
@@ -27,14 +27,6 @@
         "gen_jarjar.py",
     ],
     main: "gen_jarjar.py",
-    version: {
-        py2: {
-            enabled: false,
-        },
-        py3: {
-            enabled: true,
-        },
-    },
     visibility: ["//packages/modules/Connectivity:__subpackages__"],
 }
 
@@ -95,12 +87,4 @@
         ":jarjar-rules-generator-testjavalib",
     ],
     main: "gen_jarjar_test.py",
-    version: {
-        py2: {
-            enabled: false,
-        },
-        py3: {
-            enabled: true,
-        },
-    },
 }