commit 537451ea67a5d1c0708a3a1159eac500b0d1fddb
author Chiachang Wang <chiachangwang@google.com> Tue Jul 04 08:50:45 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 04 08:50:45 2023 +0000
tree 38a7a6e0207ffa92bdcd780f5bcd6ccb0c27b337
parent 807608edb660a8f612afbbbe01d60e902c94a058
parent d34aac4123a3fb7c42a2ae6bb06fda048fc6287f

Merge changes from topics "recoveryTimeUnit", "vpnRecovery"

* changes:
  Update tests to reflect the time unit change in Vpn
  Update tests for VPN data stall recovery

service/src/com/android/server/connectivity/ProxyTracker.java

diff --git a/service/src/com/android/server/connectivity/ProxyTracker.java b/service/src/com/android/server/connectivity/ProxyTracker.java
index 6a0918b..4415007 100644
--- a/service/src/com/android/server/connectivity/ProxyTracker.java
+++ b/service/src/com/android/server/connectivity/ProxyTracker.java
@@ -404,7 +404,7 @@
                 // network, so discount this case.
                 if (null == mGlobalProxy && !lp.getHttpProxy().getPacFileUrl()
                         .equals(defaultProxy.getPacFileUrl())) {
-                    throw new IllegalStateException("Unexpected discrepancy between proxy in LP of "
+                    Log.wtf(TAG, "Unexpected discrepancy between proxy in LP of "
                             + "default network and default proxy. The former has a PAC URL of "
                             + lp.getHttpProxy().getPacFileUrl() + " while the latter has "
                             + defaultProxy.getPacFileUrl());