Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18a8e142 authored by Chiachang Wang's avatar Chiachang Wang Committed by android-build-merger
Browse files

Merge "Avoid accessing proxy service if it's unavailable" am: 0a384663 

am: a292acf8

Change-Id: Iad7547fe9b516d0d06df308a8d8d3362611286e8
parents 23acabd6 a292acf8

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

+1 −0
Original line number Diff line number Diff line
@@ -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);