chrome/android/java/AndroidManifest.xml - Issue 2741193003: Fix networkSecurityConfig for newer versions of Android.

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: chrome/android/java/AndroidManifest.xml

Issue 2741193003: Fix networkSecurityConfig for newer versions of Android. (Closed)

Patch Set: . Created 3 years, 9 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:

Index: chrome/android/java/AndroidManifest.xml

diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml

index f497d343b1903093a4b59b0564ca80b832a683fc..a03233fa7aafe3747e2e350f85a04f4b55240989 100644

--- a/chrome/android/java/AndroidManifest.xml

+++ b/chrome/android/java/AndroidManifest.xml

@@ -121,7 +121,7 @@ by a child template that "extends" this file.

{% else %}

android:allowBackup="false"

{% endif %}

- {% if target_sdk_version|int >= 24 %}

+ {% if target_sdk_version|int >= 24 or target_sdk_version == 'O' %}

android:networkSecurityConfig="@xml/network_security_config"

{% endif %}

{% block extra_application_attributes %}{% endblock %}>

« no previous file with comments | « no previous file | no next file » | no next file with comments »