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

Commit 8224136f 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 

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

Change-Id: I4eb091b46f4aae397fb49f6e4ac5dcfc9160e680
parents b487b585 6c942b9d

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);