| commit | 0b087b5a5a00ad5243f24107620f2a0e1a734617 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Tue Jul 04 07:35:39 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 04 07:35:39 2023 +0000 |
| tree | d81c3b78ff6f45bcb0dfd1da325cf91cdf17e8aa | |
| parent | 8e8aec8f1b05888a791154561873915872651840 [diff] | |
| parent | 2c6cc63340c60691823890e3d4fad46d088f8821 [diff] |
Merge "Degrade a system crash to a Log.wtf" am: 807608edb6 am: 2c6cc63340 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2648503 Change-Id: If51e7a199d9839c4b28a6759363cc5a787131210 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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());