Merge "Make sure the PAC script content is sent again" am: 6c942b9dc9 am: 8224136fc3 (e99d391b) · Commits · e / os / android_frameworks_base

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

+8 −1

Original line number	Diff line number	Diff line
		@@ -344,11 +344,18 @@ public class PacProxyService extends IPacProxyManager.Stub {
		mProxyService = IProxyService.Stub.asInterface(binder);
		if (mProxyService == null) {
		Log.e(TAG, "No proxy service");
		} else {
		// 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);
		}
		}
		}
		}
		};
		mContext.bindService(intent, mConnection,
		Context.BIND_AUTO_CREATE \| Context.BIND_NOT_FOREGROUND \| Context.BIND_NOT_VISIBLE);