| commit | 2c6cc63340c60691823890e3d4fad46d088f8821 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Tue Jul 04 06:58:49 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 04 06:58:49 2023 +0000 |
| tree | 61dc50356a81a039a3fa8c84bd105b9a7315ab91 | |
| parent | 758f1d37617d76abe9f2f5136f76a6d0cff86a60 [diff] | |
| parent | 807608edb660a8f612afbbbe01d60e902c94a058 [diff] |
Merge "Degrade a system crash to a Log.wtf" am: 807608edb6 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2648503 Change-Id: I61f2df161ac3e81b413eac5c83f7ebdb0094e65d 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());