commit 4eacf772c2431dc342e26b9631ddd42dc191dc85
author Maciej Żenczykowski <maze@google.com> Tue May 31 22:21:48 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 31 22:21:48 2022 +0000
tree edbdf9c922f67385c142f25d92e7416b7c7e6a4b
parent 7884a2f2b84402a54cd9d04bd03451bdf26e6772
parent 60cbed385dcf3c640674c48b7cd4d60967047cf0

Merge "Support more than 8 firewall chains / match types."

TEST_MAPPING

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 85072a7..bb6d655 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -41,6 +41,9 @@
       "name": "connectivity_native_test"
     },
     {
+      "name": "libclat_test"
+    },
+    {
       "name": "netd_updatable_unit_test"
     },
     {
@@ -68,9 +71,6 @@
       "keywords": ["netd-device-kernel-4.9", "netd-device-kernel-4.14"]
     },
     {
-      "name": "libclat_test"
-    },
-    {
       "name": "traffic_controller_unit_test",
       "keywords": ["netd-device-kernel-4.9", "netd-device-kernel-4.14"]
     },

Tethering/apex/manifest.json

diff --git a/Tethering/apex/manifest.json b/Tethering/apex/manifest.json
index 88f13b2..3cb03ed 100644
--- a/Tethering/apex/manifest.json
+++ b/Tethering/apex/manifest.json
@@ -1,4 +1,4 @@
 {
   "name": "com.android.tethering",
-  "version": 319999900
+  "version": 339990000
 }

service/src/com/android/server/ConnectivityService.java

diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java
index f760d3b..c1de7a0 100644
--- a/service/src/com/android/server/ConnectivityService.java
+++ b/service/src/com/android/server/ConnectivityService.java
@@ -3872,7 +3872,6 @@
             }
 
             final boolean wasValidated = nai.lastValidated;
-            final boolean wasDefault = isDefaultNetwork(nai);
             final boolean wasPartial = nai.partialConnectivity;
             nai.partialConnectivity = ((testResult & NETWORK_VALIDATION_RESULT_PARTIAL) != 0);
             final boolean partialConnectivityChanged =