OSDN Git Service

Avoid accessing proxy service if it's unavailable
authorChiachang Wang <chiachangwang@google.com>
Thu, 17 Jan 2019 02:18:39 +0000 (10:18 +0800)
committerChiachang Wang <chiachangwang@google.com>
Thu, 17 Jan 2019 02:43:38 +0000 (02:43 +0000)
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

services/core/java/com/android/server/connectivity/PacManager.java

index 3ea9810..9789688 100644 (file)
@@ -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);