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

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

Change-Id: I3fc9182277fb8abcaf08d14c5526904155f6e95f
This commit is contained in:
Aaron Huang
2021-05-31 11:07:54 +00:00
committed by Automerger Merge Worker
parent 82a040f509 8224136fc3
commit e99d391bf7
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -345,7 +345,14 @@ public class PacProxyService extends IPacProxyManager.Stub {
if (mProxyService == null) {
Log.e(TAG, "No proxy service");
} else {
mNetThreadHandler.post(mPacDownloader);
// 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);
}
}
}
}