From 40b249c1a6ae1aae7e3b4641bed0335e3dba11da Mon Sep 17 00:00:00 2001
From: Aaron Huang <huangaaron@google.com>
Date: Mon, 31 May 2021 11:07:54 +0000
Subject: [PATCH] Make sure the PAC script content is sent again

...when the PAC service crashes.

Bug: 185409199
Test: manual
Original-Change: https://android-review.googlesource.com/1711211
Merged-In: Ic76428f42f37f8552a526190764ad32e2874adb0
Change-Id: Ic76428f42f37f8552a526190764ad32e2874adb0
---
 .../com/android/server/connectivity/PacProxyService.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/connectivity/PacProxyService.java b/services/core/java/com/android/server/connectivity/PacProxyService.java
index d23b488f30542..00703390a1184 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 @@ 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);
+                        }
                     }
                 }
             }