android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java - Issue 1882783002: [WebView] Disallow geolocation on insecure origins for apps targeting N and higher.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java

Issue 1882783002: [WebView] Disallow geolocation on insecure origins for apps targeting N and higher. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « no previous file | android_webview/java/src/org/chromium/android_webview/AwSettings.java » ('j') | android_webview/java/src/org/chromium/android_webview/AwSettings.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java

diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java

index 8f25c5d1535f61357278b57559e27445476b518e..4769a4e01185c8b7c2e9b1fec508418cc5a5d8ec 100644

--- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java

+++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java

@@ -235,12 +235,15 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate

mAppTargetSdkVersion < Build.VERSION_CODES.JELLY_BEAN;

final boolean areLegacyQuirksEnabled = mAppTargetSdkVersion < Build.VERSION_CODES.KITKAT;

final boolean allowEmptyDocumentPersistence = mAppTargetSdkVersion <= Build.VERSION_CODES.M;

+ final boolean allowGeolocationOnInsecureOrigins =

+ mAppTargetSdkVersion <= Build.VERSION_CODES.M;

mContentsClientAdapter =

new WebViewContentsClientAdapter(mWebView, mContext, mFactory.getWebViewDelegate());

mWebSettings = new ContentSettingsAdapter(

new AwSettings(mContext, isAccessFromFileURLsGrantedByDefault,

- areLegacyQuirksEnabled, allowEmptyDocumentPersistence));

+ areLegacyQuirksEnabled, allowEmptyDocumentPersistence,

+ allowGeolocationOnInsecureOrigins));

if (mAppTargetSdkVersion < Build.VERSION_CODES.LOLLIPOP) {

// Prior to Lollipop we always allowed third party cookies and mixed content.