commit 2ac4d2b82735679c7ab12fd43ff43746cca3163f
author Xiao Ma <xiaom@google.com> Fri Sep 17 11:28:17 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 17 11:28:17 2021 +0000
tree c1a248948c983b7aa20fe674a03bd36fba0bd6d0
parent 52dfb2472d7aa1da2729deda930f6b66830aa111
parent 93533836266e93ccddc7b0d451bac8c72b14ab98

Merge "Run NetworkStackIntegrationTest with Parameterized.class."

common/networkstackclient/Android.bp

diff --git a/common/networkstackclient/Android.bp b/common/networkstackclient/Android.bp
index 02a39f6..c344d07 100644
--- a/common/networkstackclient/Android.bp
+++ b/common/networkstackclient/Android.bp
@@ -121,7 +121,7 @@
             enabled: false,
         },
     },
-    imports: ["ipmemorystore-aidl-interfaces"],
+    imports: ["ipmemorystore-aidl-interfaces-V10"],
     versions: [
         "1",
         "2",

src/com/android/server/connectivity/NetworkMonitor.java

diff --git a/src/com/android/server/connectivity/NetworkMonitor.java b/src/com/android/server/connectivity/NetworkMonitor.java
index 36b6492..cb0ee18 100755
--- a/src/com/android/server/connectivity/NetworkMonitor.java
+++ b/src/com/android/server/connectivity/NetworkMonitor.java
@@ -1986,11 +1986,17 @@
         }
 
         final long now = System.currentTimeMillis();
-        if (expTime < now || (expTime - now) > TEST_URL_EXPIRATION_MS) return null;
+        if (expTime < now || (expTime - now) > TEST_URL_EXPIRATION_MS) {
+            logw("Skipping test URL with expiration " + expTime + ", now " + now);
+            return null;
+        }
 
         final String strUrl = mDependencies.getDeviceConfigProperty(NAMESPACE_CONNECTIVITY,
                 key, null /* defaultValue */);
-        if (!isValidTestUrl(strUrl)) return null;
+        if (!isValidTestUrl(strUrl)) {
+            logw("Skipping invalid test URL " + strUrl);
+            return null;
+        }
         return makeURL(strUrl);
     }