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

Commit 1b2f1300 authored by Aaron Huang's avatar Aaron Huang Committed by Automerger Merge Worker
Browse files

Merge "Make sure the PAC script content is sent again" am: 6c942b9d am:... 

Merge "Make sure the PAC script content is sent again" am: 6c942b9d am: 8224136f am: e99d391b am: 8adb4a48

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1711211

Change-Id: Ia48f8847835766cc5135bda2deb3b1e363eeff75
parents 475d21c3 8adb4a48

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

+8 −1
Original line number Diff line number Diff line
@@ -344,11 +344,18 @@ public class PacProxyService extends IPacProxyManager.Stub { 
                    mProxyService = IProxyService.Stub.asInterface(binder);

                    if (mProxyService == null) {

                        Log.e(TAG, "No proxy service");

                    } else {

                        // If mCurrentPac is not null, then the PacService might have

                        // crashed and restarted. The download task will not actually

                        // call setCurrentProxyScript, so call setCurrentProxyScript here.

                        if (mCurrentPac != null) {

                            setCurrentProxyScript(mCurrentPac);

                        } else {

                            mNetThreadHandler.post(mPacDownloader);

                        }

                    }

                }

            }

        };

        mContext.bindService(intent, mConnection,

                Context.BIND_AUTO_CREATE | Context.BIND_NOT_FOREGROUND | Context.BIND_NOT_VISIBLE);