Merge "Make sure the PAC script content is sent again"

2021-05-31 10:13:00 +00:00
parent 6963e8d05b eb9d9b261e
commit 6c942b9dc9
1 changed files with 8 additions and 1 deletions
--- a/services/core/java/com/android/server/connectivity/PacProxyService.java
+++ b/services/core/java/com/android/server/connectivity/PacProxyService.java
@@ -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);
+                        }
                    }
                }
            }