| commit | 80ea19e2ac2d99b697d855042782716faa6c2be8 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Tue Jul 04 08:21:46 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 04 08:21:46 2023 +0000 |
| tree | 3ac9f66f624f4c479c69999d3f9eda4f8cf6c467 | |
| parent | d97df48620a08fb2fbbb92cb77e135f150b81c00 [diff] | |
| parent | 0b087b5a5a00ad5243f24107620f2a0e1a734617 [diff] |
Merge "Degrade a system crash to a Log.wtf" am: 807608edb6 am: 2c6cc63340 am: 0b087b5a5a Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2648503 Change-Id: Ia80327d2652383f6be48e575b58578ffcea23289 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());