diff options
-rw-r--r-- | services/core/java/com/android/server/connectivity/PacProxyService.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/connectivity/PacProxyService.java b/services/core/java/com/android/server/connectivity/PacProxyService.java index d23b488f3054..00703390a118 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); + } } } } |