Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make sure the PAC script content is sent again" am: 6c942b9dc9 am: 8224136fc3 am: e99d391bf7

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

Change-Id: Idbb25d0da65812b82ae2f5b7fda163d150700032
This commit is contained in:
Aaron Huang
2021-05-31 11:31:17 +00:00
committed by Automerger Merge Worker
parent 08e4e72585 e99d391bf7
commit 8adb4a48fb
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/connectivity/PacProxyService.java
View File

@@ -344,11 +344,18 @@ public class PacProxyService extends IPacProxyManager.Stub {
mProxyService = IProxyService.Stub.asInterface(binder); mProxyService = IProxyService.Stub.asInterface(binder);
if (mProxyService == null) { if (mProxyService == null) {
Log.e(TAG, "No proxy service"); 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 { } else {
mNetThreadHandler.post(mPacDownloader); mNetThreadHandler.post(mPacDownloader);
} }
} }
} }
}
}; };
mContext.bindService(intent, mConnection, mContext.bindService(intent, mConnection,
Context.BIND_AUTO_CREATE | Context.BIND_NOT_FOREGROUND | Context.BIND_NOT_VISIBLE); Context.BIND_AUTO_CREATE | Context.BIND_NOT_FOREGROUND | Context.BIND_NOT_VISIBLE);