commit 10cbb66f1eb5303923fc0ba48016c9591e2e3390
author Aaron Huang <huangaaron@google.com> Tue Jun 01 08:47:13 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 01 08:47:13 2021 +0000
tree 61fce74225ae01969c8172a7fe4a90ca073e9f8e
parent c65974f14e0e6520631161231bb8ecbb021b275b
parent 40b249c1a6ae1aae7e3b4641bed0335e3dba11da

Merge "Make sure the PAC script content is sent again" into sc-dev

services/core/java/com/android/server/connectivity/PacProxyService.java

diff --git a/services/core/java/com/android/server/connectivity/PacProxyService.java b/services/core/java/com/android/server/connectivity/PacProxyService.java
index d23b488..0070339 100644
--- a/services/core/java/com/android/server/connectivity/PacProxyService.java
+++ b/services/core/java/com/android/server/connectivity/PacProxyService.java
@@ -345,7 +345,14 @@
                     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);
+                        }
                     }
                 }
             }