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

Updated patches after a rebase on master.

Browse Source
This commit is contained in:
mkarolin
2020-12-08 15:26:48 -05:00
parent 3012717732
commit 5e18aaadb7
11 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patches/chrome-android-java-AndroidManifest.xml.patch
+5 -5
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
index 2948f6a58cafde782ca2a7860d352ed56cf3cd20..a40f8df35682255739f08b084db04a0e3cac1145 100644
index 2948f6a58cafde782ca2a7860d352ed56cf3cd20..c1cad83439f8da614abbd8c69db13e88d8d6e0ab 100644
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -38,7 +38,9 @@ by a child template that "extends" this file.
@@ -37,7 +37,7 @@ index 2948f6a58cafde782ca2a7860d352ed56cf3cd20..a40f8df35682255739f08b084db04a0e
<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"/>
@@ -107,7 +115,9 @@ by a child template that "extends" this file.
@@ -107,7 +116,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"/>
@@ -47,7 +47,7 @@ index 2948f6a58cafde782ca2a7860d352ed56cf3cd20..a40f8df35682255739f08b084db04a0e
{% block extra_uses_permissions %}
{% endblock %}
@@ -160,6 +170,7 @@ by a child template that "extends" this file.
@@ -160,6 +171,7 @@ by a child template that "extends" this file.
org.chromium.chrome.browser.ChromeApplication
{%- endif -%}
{% endblock %}"
@@ -55,7 +55,7 @@ index 2948f6a58cafde782ca2a7860d352ed56cf3cd20..a40f8df35682255739f08b084db04a0e
android:icon="@drawable/ic_launcher"
android:roundIcon="@drawable/ic_launcher_round"
android:label="{% block application_label %}@string/app_name{% endblock %}"
@@ -1166,6 +1177,7 @@ by a child template that "extends" this file.
@@ -1166,6 +1178,7 @@ by a child template that "extends" this file.
</activity>
{% endif %}
@@ -63,7 +63,7 @@ index 2948f6a58cafde782ca2a7860d352ed56cf3cd20..a40f8df35682255739f08b084db04a0e
{% block extra_application_definitions %}
{% endblock %}
{% endmacro %}
@@ -1248,6 +1260,7 @@ by a child template that "extends" this file.
@@ -1248,6 +1261,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" />