86 lines
4.6 KiB
Diff
86 lines
4.6 KiB
Diff
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
|
|
index 6f3722cd64029848c1737ced63889cf7cb41c5aa..7195ef1e5fc2c67861001a44e7070dea584fae62 100644
|
|
--- a/chrome/android/java/AndroidManifest.xml
|
|
+++ b/chrome/android/java/AndroidManifest.xml
|
|
@@ -28,6 +28,7 @@ by a child template that "extends" this file.
|
|
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
|
|
<uses-permission-sdk-23 android:name="android.permission.ACCESS_WIFI_STATE" />
|
|
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
|
+ {% include "//brave/android/java/AndroidManifest_user_permissions.xml" %}
|
|
|
|
<!--
|
|
Enable runtime permissions as uses-permission in tip of tree builds
|
|
@@ -62,7 +63,9 @@ by a child template that "extends" this file.
|
|
<uses-permission-sdk-23 android:name="android.permission.BLUETOOTH_SCAN"
|
|
android:usesPermissionFlags="neverForLocation"/>
|
|
|
|
+<!--
|
|
<uses-permission-sdk-23 android:name="android.permission.READ_CONTACTS"/>
|
|
+-->
|
|
<uses-permission-sdk-23 android:name="android.permission.REORDER_TASKS"/>
|
|
<uses-permission-sdk-23 android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
|
|
|
|
@@ -74,11 +77,17 @@ by a child template that "extends" this file.
|
|
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" tools:ignore="SystemPermissionTypo" />
|
|
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" tools:ignore="SystemPermissionTypo" />
|
|
|
|
+<!--
|
|
<uses-permission android:name="android.permission.GET_ACCOUNTS"/>
|
|
+-->
|
|
<uses-permission android:name="android.permission.INTERNET"/>
|
|
+<!--
|
|
<uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/>
|
|
+-->
|
|
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
|
|
+<!--
|
|
<uses-permission android:name="android.permission.NFC"/>
|
|
+-->
|
|
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
|
|
<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
|
|
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
|
|
@@ -87,7 +96,9 @@ by a child template that "extends" this file.
|
|
<uses-permission-sdk-23 android:name="android.permission.READ_MEDIA_VIDEO"/>
|
|
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
|
<uses-permission android:name="android.permission.RECORD_AUDIO"/>
|
|
+<!--
|
|
<uses-permission android:name="android.permission.USE_CREDENTIALS"/>
|
|
+-->
|
|
<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"/>
|
|
@@ -138,7 +149,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"/>
|
|
|
|
+<!--
|
|
<uses-permission android:name="com.google.android.apps.now.CURRENT_ACCOUNT_ACCESS" />
|
|
+--> <uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/> <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
|
|
|
|
{% block extra_uses_permissions %}
|
|
{% endblock %}
|
|
@@ -200,7 +213,7 @@ by a child template that "extends" this file.
|
|
android:networkSecurityConfig="@xml/network_security_config"
|
|
android:allowAudioPlaybackCapture="false"
|
|
android:appComponentFactory="org.chromium.chrome.browser.base.SplitCompatAppComponentFactory"
|
|
- android:enableOnBackInvokedCallback="true"
|
|
+ android:enableOnBackInvokedCallback="false"
|
|
{% block extra_application_attributes %}{% endblock %}>
|
|
|
|
{% if channel in ['canary', 'dev', 'default'] %}
|
|
@@ -349,6 +362,7 @@ by a child template that "extends" this file.
|
|
<intent-filter>
|
|
<action android:name="com.sec.android.airview.HOVER" />
|
|
</intent-filter>
|
|
+ {% include "//brave/android/java/AndroidManifest_intent_filters.xml" %}
|
|
<meta-data android:name="android.app.searchable"
|
|
android:resource="@xml/searchable" />
|
|
</activity-alias>
|
|
@@ -1202,6 +1216,7 @@ by a child template that "extends" this file.
|
|
<property android:name="android.adservices.AD_SERVICES_CONFIG"
|
|
android:resource="@xml/ad_services_config" />
|
|
|
|
+ {% include "//brave/android/java/AndroidManifest.xml" %}
|
|
{% block extra_application_definitions %}
|
|
{% endblock %}
|
|
{% endmacro %}
|