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

Make sure the PAC script content is sent again

Browse Source 
...when the PAC service crashes.

Bug: 185409199
Test: manual
Original-Change: https://android-review.googlesource.com/1711211
Merged-In: Ic76428f42f37f8552a526190764ad32e2874adb0
Change-Id: Ic76428f42f37f8552a526190764ad32e2874adb0
This commit is contained in:
Aaron Huang
2021-05-31 11:07:54 +00:00
committed by Lorenzo Colitti
parent 947270efc3
commit 40b249c1a6
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);
}
}
}
}