Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(148)

Side by Side 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:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <!-- Copyright 2015 The Chromium Authors. All rights reserved. 2 <!-- Copyright 2015 The Chromium Authors. All rights reserved.
3 Use of this source code is governed by a BSD-style license that can be 3 Use of this source code is governed by a BSD-style license that can be
4 found in the LICENSE file. --> 4 found in the LICENSE file. -->
5 5
6 <!-- 6 <!--
7 Note: This is a jinja2 template, processed at build time into the final manifest . 7 Note: This is a jinja2 template, processed at build time into the final manifest .
8 8
9 Blocks denoted with { % block some_name % }foo{ % endblock % } can be overridden 9 Blocks denoted with { % block some_name % }foo{ % endblock % } can be overridden
10 by a child template that "extends" this file. 10 by a child template that "extends" this file.
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 android:manageSpaceActivity="@string/manage_space_activity" 114 android:manageSpaceActivity="@string/manage_space_activity"
115 android:supportsRtl="true" 115 android:supportsRtl="true"
116 {% if backup_key is defined %} 116 {% if backup_key is defined %}
117 android:allowBackup="true" 117 android:allowBackup="true"
118 android:backupAgent="org.chromium.chrome.browser.ChromeBackupAgent" 118 android:backupAgent="org.chromium.chrome.browser.ChromeBackupAgent"
119 android:fullBackupOnly="false" 119 android:fullBackupOnly="false"
120 android:restoreAnyVersion="true" 120 android:restoreAnyVersion="true"
121 {% else %} 121 {% else %}
122 android:allowBackup="false" 122 android:allowBackup="false"
123 {% endif %} 123 {% endif %}
124 {% if target_sdk_version|int >= 24 %} 124 {% if target_sdk_version|int >= 24 or target_sdk_version == 'O' %}
125 android:networkSecurityConfig="@xml/network_security_config" 125 android:networkSecurityConfig="@xml/network_security_config"
126 {% endif %} 126 {% endif %}
127 {% block extra_application_attributes %}{% endblock %}> 127 {% block extra_application_attributes %}{% endblock %}>
128 128
129 <!-- Samsung MultiWindow Support --> 129 <!-- Samsung MultiWindow Support -->
130 <meta-data android:name="com.samsung.android.sdk.multiwindow.enable" 130 <meta-data android:name="com.samsung.android.sdk.multiwindow.enable"
131 android:value="true" /> 131 android:value="true" />
132 <meta-data android:name="com.samsung.android.sdk.multiwindow.multiinstan ce.enable" 132 <meta-data android:name="com.samsung.android.sdk.multiwindow.multiinstan ce.enable"
133 android:value="true" /> 133 android:value="true" />
134 <meta-data android:name="com.samsung.android.sdk.multiwindow.multiinstan ce.launchmode" 134 <meta-data android:name="com.samsung.android.sdk.multiwindow.multiinstan ce.launchmode"
(...skipping 815 matching lines...) Expand 10 before | Expand all | Expand 10 after
950 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 950 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
951 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 951 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
952 The downstream manifest replaces this block, and hence replaces the list of media route 952 The downstream manifest replaces this block, and hence replaces the list of media route
953 controllers with its own list. --> 953 controllers with its own list. -->
954 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 954 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
955 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 955 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
956 956
957 {% endblock %} 957 {% endblock %}
958 </application> 958 </application>
959 </manifest> 959 </manifest>
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698