Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Conflict-resolved patches from Chromium 87.0.4278.0 to Chromium 87.0.4280.11.

Browse Source
This commit is contained in:
mkarolin
2020-10-28 14:03:59 -04:00
parent 9c61785d87
commit 7c703e2d86
4 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patches/chrome-android-java-AndroidManifest.xml.patch
+11 -11
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
index a18f36f882105898177f778b0dcfe682f2b09236..39f8e0e174f8fbc9eaf5c04ab7b2c47cc3e9d835 100644
index 4d0a6e271de41347ae81170fd6ee32521c6109c5..9387bcfa09bba250795f8812058ea9c79e6d7653 100644
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -34,7 +34,9 @@ by a child template that "extends" this file.
@@ -38,7 +38,9 @@ by a child template that "extends" this file.
{% endif %}
<uses-permission-sdk-23 android:name="android.permission.BLUETOOTH"/>
<uses-permission-sdk-23 android:name="android.permission.BLUETOOTH_ADMIN"/>
@@ -12,7 +12,7 @@ index a18f36f882105898177f778b0dcfe682f2b09236..39f8e0e174f8fbc9eaf5c04ab7b2c47c
<uses-permission-sdk-23 android:name="android.permission.REORDER_TASKS"/>
<uses-permission-sdk-23 android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
@@ -44,9 +46,13 @@ by a child template that "extends" this file.
@@ -48,9 +50,13 @@ by a child template that "extends" this file.
{% if target_sdk_version|int > 27 or target_sdk_version == "Q" %}
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
{% endif %}
@@ -26,7 +26,7 @@ index a18f36f882105898177f778b0dcfe682f2b09236..39f8e0e174f8fbc9eaf5c04ab7b2c47c
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
<uses-permission android:name="android.permission.NFC"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
@@ -54,7 +60,9 @@ by a child template that "extends" this file.
@@ -58,7 +64,9 @@ by a child template that "extends" this file.
<uses-permission android:name="android.permission.READ_SYNC_STATS"/>
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
<uses-permission android:name="android.permission.RECORD_AUDIO"/>
@@ -36,7 +36,7 @@ index a18f36f882105898177f778b0dcfe682f2b09236..39f8e0e174f8fbc9eaf5c04ab7b2c47c
<uses-permission-sdk-23 android:name="android.permission.USE_BIOMETRIC"/>
<uses-permission-sdk-23 android:name="android.permission.USE_FINGERPRINT"/>
<uses-permission android:name="android.permission.VIBRATE"/>
@@ -101,7 +109,9 @@ by a child template that "extends" this file.
@@ -105,7 +113,9 @@ by a child template that "extends" this file.
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
@@ -46,15 +46,15 @@ index a18f36f882105898177f778b0dcfe682f2b09236..39f8e0e174f8fbc9eaf5c04ab7b2c47c
{% block extra_uses_permissions %}
{% endblock %}
@@ -148,6 +158,7 @@ by a child template that "extends" this file.
<!-- Set android:largeHeap to "true" to allow more than the default
Java heap limit (32Mb on Nexus S, 48Mb on Xoom). -->
<application android:name="{% block application_name %}org.chromium.chrome.browser.ChromeApplication{% endblock %}"
@@ -158,6 +168,7 @@ by a child template that "extends" this file.
org.chromium.chrome.browser.ChromeApplication
{%- endif -%}
{% endblock %}"
+ android:requestLegacyExternalStorage="true"
android:icon="@drawable/ic_launcher"
android:roundIcon="@drawable/ic_launcher_round"
android:label="{% block application_label %}@string/app_name{% endblock %}"
@@ -199,6 +210,7 @@ by a child template that "extends" this file.
@@ -209,6 +220,7 @@ by a child template that "extends" this file.
<!-- ARCore APK integration -->
<!-- This tag indicates that this application optionally uses ARCore. -->
<meta-data android:name="com.google.ar.core" android:value="optional" />
@@ -62,7 +62,7 @@ index a18f36f882105898177f778b0dcfe682f2b09236..39f8e0e174f8fbc9eaf5c04ab7b2c47c
{% endif %}
<!-- Cast support -->
@@ -1215,6 +1227,7 @@ by a child template that "extends" this file.
@@ -1172,6 +1184,7 @@ by a child template that "extends" this file.
</activity>
{% endif %}