From c517a6fa456c8dfbe1f6dfa62dfc09d6db27cce8 Mon Sep 17 00:00:00 2001
From: Chiachang Wang <chiachangwang@google.com>
Date: Thu, 17 Jan 2019 10:18:39 +0800
Subject: 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
---
 services/core/java/com/android/server/connectivity/PacManager.java | 1 +
 1 file changed, 1 insertion(+)

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);
-- 
cgit v1.2.3-59-g8ed1b