summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chiachang Wang <chiachangwang@google.com> 2019-01-17 10:18:39 +0800
committer Chiachang Wang <chiachangwang@google.com> 2019-01-17 02:43:38 +0000
commitc517a6fa456c8dfbe1f6dfa62dfc09d6db27cce8 (patch)
tree94b3de5b37640158926e10e80df5d7d956c2d99a
parentde92fb78fedcf29799f05cb5dd9933639a4aca2e (diff)
Avoid accessing proxy service if it's unavailable
In some cases, proxy service may not be available. Return directly and avoid using it to prevent null object exception. Bug: 122902676 Test: atest FrameworksNetTests Change-Id: I5faec8716da168225928e8caec43086a1fbb0c3c
-rw-r--r--services/core/java/com/android/server/connectivity/PacManager.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/connectivity/PacManager.java b/services/core/java/com/android/server/connectivity/PacManager.java
index 3ea9810f2d76..97896889f243 100644
--- a/services/core/java/com/android/server/connectivity/PacManager.java
+++ b/services/core/java/com/android/server/connectivity/PacManager.java
@@ -282,6 +282,7 @@ public class PacManager {
private void setCurrentProxyScript(String script) {
if (mProxyService == null) {
Log.e(TAG, "setCurrentProxyScript: no proxy service");
+ return;
}
try {
mProxyService.setPacFile(script);