android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java - Issue 2895293002: Android: tidy up outdated version checks.

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/WebViewContentsClientAdapter.java

Issue 2895293002: Android: tidy up outdated version checks. (Closed)

Patch Set: Created 3 years, 7 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 | « android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java ('k') | android_webview/java/src/org/chromium/android_webview/AwContents.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 15ccdf2b191c936ab7903f577b78aeb7db05b938..2a3931fe5803fadb5907c18abb2746e68c639c8a 100644

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

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

@@ -349,8 +349,7 @@ class WebViewContentsClientAdapter extends AwContentsClient {

TraceEvent.begin("WebViewContentsClientAdapter.shouldOverrideUrlLoading");

if (TRACE) Log.d(TAG, "shouldOverrideUrlLoading=" + request.url);

boolean result;

- if (Build.VERSION.CODENAME.equals("N")

- || Build.VERSION.SDK_INT > Build.VERSION_CODES.M) {

+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {

result = mWebViewClient.shouldOverrideUrlLoading(

mWebView, new WebResourceRequestImpl(request));

} else {