124 lines
6.4 KiB
Diff
124 lines
6.4 KiB
Diff
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
|
|
index 030736d46a43d9bd21bfc02ee4bd3ed7bb03f8ed..0fec90e5f7fa75b9c99223d7fef86f99c2dfbd2d 100644
|
|
--- a/chrome/android/java/AndroidManifest.xml
|
|
+++ b/chrome/android/java/AndroidManifest.xml
|
|
@@ -38,6 +38,7 @@ by a child template that "extends" this file.
|
|
|
|
<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" %}
|
|
|
|
<uses-permission-sdk-23 android:name="android.permission.ACCESS_ADSERVICES_ATTRIBUTION" />
|
|
<uses-permission-sdk-23 android:name="android.permission.BLUETOOTH_ADMIN" android:maxSdkVersion="30"/>
|
|
@@ -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"/>
|
|
|
|
<!-- Needed for allowing downloaded APKs to be installed. -->
|
|
@@ -79,24 +82,32 @@ by a child template that "extends" this file.
|
|
{% endif %}
|
|
{% set enable_screen_capture = enable_screen_capture|default(0) %}
|
|
{% if enable_screen_capture == "true" %}
|
|
+<!--
|
|
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION" />
|
|
+-->
|
|
{% endif %}
|
|
<!-- TODO(crbug.com/40259231): Remove this tools:ignore attribute once it's no longer necessary. -->
|
|
<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.RUN_USER_INITIATED_JOBS" />
|
|
|
|
+<!--
|
|
<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" />
|
|
|
|
<!-- Needed to determine whether an app installed on the device should handle a web navigation. -->
|
|
<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
|
|
|
|
- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
|
|
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32"/>
|
|
<uses-permission-sdk-23 android:name="android.permission.READ_MEDIA_AUDIO"/>
|
|
|
|
<!-- Needed for handling media-viewing Intents from other apps for images and video on low end
|
|
@@ -114,12 +125,14 @@ by a child template that "extends" this file.
|
|
resizeTo, moveBy}|).
|
|
-->
|
|
<uses-permission android:name="android.permission.REPOSITION_SELF_WINDOWS"/>
|
|
+<!--
|
|
<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"/>
|
|
<uses-permission android:name="android.permission.WAKE_LOCK"/>
|
|
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
|
|
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="32"/>
|
|
|
|
<!-- Permission for using Android 14's credential management framework. -->
|
|
<uses-permission android:name="android.permission.CREDENTIAL_MANAGER_QUERY_CANDIDATE_CREDENTIALS"/>
|
|
@@ -166,7 +179,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"/>
|
|
|
|
{% block extra_uses_permissions %}
|
|
{% endblock %}
|
|
@@ -387,6 +402,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>
|
|
@@ -929,6 +945,7 @@ by a child template that "extends" this file.
|
|
</service>
|
|
|
|
<!-- Quick Action Search widget -->
|
|
+ <!--
|
|
<receiver
|
|
android:name="org.chromium.chrome.browser.quickactionsearchwidget.QuickActionSearchWidgetProvider$QuickActionSearchWidgetProviderSearch"
|
|
android:label="@string/quick_action_search_widget_title"
|
|
@@ -958,6 +975,7 @@ by a child template that "extends" this file.
|
|
android:name="android.appwidget.provider"
|
|
android:resource="@xml/quick_action_search_widget_dino_info" />
|
|
</receiver>
|
|
+ -->
|
|
|
|
<!-- Bookmarks widget -->
|
|
<receiver android:name="com.google.android.apps.chrome.appwidget.bookmarks.BookmarkThumbnailWidgetProvider"
|
|
@@ -1177,7 +1195,7 @@ by a child template that "extends" this file.
|
|
{% elif is_desktop_android == "true" %}
|
|
android:foregroundServiceType="camera|microphone"
|
|
{% elif enable_screen_capture == "true" %}
|
|
- android:foregroundServiceType="mediaProjection|mediaPlayback"
|
|
+ android:foregroundServiceType="mediaPlayback"
|
|
{% endif %}
|
|
android:exported="false"/>
|
|
<service android:name="org.chromium.chrome.browser.media.ui.ChromeMediaNotificationControllerServices$PlaybackListenerService"
|
|
@@ -1272,6 +1290,7 @@ by a child template that "extends" this file.
|
|
</activity>
|
|
{% endif %}
|
|
|
|
+ {% include "//brave/android/java/AndroidManifest.xml" %}
|
|
{% block extra_application_definitions %}
|
|
{% endblock %}
|
|
{% endmacro %}
|