Merge "Use synchronize methods instead of synchronized blocks in PacWebView." (f8bd2c5b) · Commits · e / os / android_frameworks_base

packages/services/PacProcessor/src/com/android/pacprocessor/PacWebView.java

+7 −17

Original line number	Diff line number	Diff line
		@@ -19,8 +19,6 @@ package com.android.pacprocessor;
		import android.util.Log;
		import android.webkit.PacProcessor;

		import com.android.internal.annotations.GuardedBy;

		/**
		* @hide
		*/
		@@ -28,10 +26,6 @@ public class PacWebView implements LibpacInterface {
		private static final String TAG = "PacWebView";

		private static final PacWebView sInstance = new PacWebView();

		private Object mLock = new Object();

		@GuardedBy("mLock")
		private PacProcessor mProcessor = PacProcessor.getInstance();

		public static PacWebView getInstance() {
		@@ -39,20 +33,16 @@ public class PacWebView implements LibpacInterface {
		}

		@Override
		public boolean setCurrentProxyScript(String script) {
		synchronized (mLock) {
		public synchronized boolean setCurrentProxyScript(String script) {
		if (!mProcessor.setProxyScript(script)) {
		Log.e(TAG, "Unable to parse proxy script.");
		return false;
		}
		return true;
		}
		}

		@Override
		public String makeProxyRequest(String url, String host) {
		synchronized (mLock) {
		public synchronized String makeProxyRequest(String url, String host) {
		return mProcessor.findProxyForUrl(url);
		}
		}
		}