Merge "Add a flag to force suppression of the auth dialog." (85765a43) · Commits · e / os / android_frameworks_base

core/java/android/webkit/BrowserFrame.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -1129,7 +1129,8 @@ class BrowserFrame extends Handler {
		* synchronous call and unable to pump our MessageQueue.
		*/
		private void didReceiveAuthenticationChallenge(
		final int handle, String host, String realm, final boolean useCachedCredentials) {
		final int handle, String host, String realm, final boolean useCachedCredentials,
		final boolean suppressDialog) {

		HttpAuthHandler handler = new HttpAuthHandler() {

		@@ -1147,6 +1148,11 @@ class BrowserFrame extends Handler {
		public void cancel() {
		nativeAuthenticationCancel(handle);
		}

		@Override
		public boolean suppressDialog() {
		return suppressDialog;
		}
		};
		mCallbackProxy.onReceivedHttpAuthRequest(handler, host, realm);
		}

+8 −0

Original line number	Diff line number	Diff line
		@@ -50,4 +50,12 @@ public class HttpAuthHandler extends Handler {
		*/
		public void proceed(String username, String password) {
		}

		/**
		* return true if the prompt dialog should be suppressed.
		* @hide
		*/
		public boolean suppressDialog() {
		return false;
		}
		}