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

Commit a292acf8 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

Change-Id: I75fbeec6c253955684c56c5463847590ae43f73a
parents 507fd1c1 0a384663

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -282,6 +282,7 @@ public class PacManager { 
    private void setCurrentProxyScript(String script) {

    private void setCurrentProxyScript(String script) {

        if (mProxyService == null) {

        if (mProxyService == null) {

            Log.e(TAG, "setCurrentProxyScript: no proxy service");

            Log.e(TAG, "setCurrentProxyScript: no proxy service");

            return;

        }

        }

        try {

        try {

            mProxyService.setPacFile(script);

            mProxyService.setPacFile(script);