Serg
612402c376
This is a fix of regression introduced in https://github.com/brave/brave-core/pull/28327. Export bookmarks fails silently on Android 10, 11 and 12 devices because of android.permission.WRITE_EXTERNAL_STORAGE permission restriction to Android 9 devices and below. Resolves: https://github.com/brave/brave-browser/issues/47721
101 lines
5.3 KiB
Diff
101 lines
5.3 KiB
Diff
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
|
|
index 40da3e5ffeab78e7db474151e77d50363a05aa4a..665c82b85253679f6e149965b4ed8f43c30d88e9 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"/>
|
|
|
|
@@ -83,25 +86,33 @@ by a child template that "extends" this file.
|
|
<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" />
|
|
<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"/>
|
|
<uses-permission-sdk-23 android:name="android.permission.READ_MEDIA_IMAGES"/>
|
|
<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"/>
|
|
<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"/>
|
|
@@ -148,7 +159,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 %}
|
|
@@ -359,6 +372,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>
|
|
@@ -887,6 +901,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"
|
|
@@ -910,6 +925,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"
|
|
@@ -1220,6 +1236,7 @@ by a child template that "extends" this file.
|
|
</activity>
|
|
{% endif %}
|
|
|
|
+ {% include "//brave/android/java/AndroidManifest.xml" %}
|
|
{% block extra_application_definitions %}
|
|
{% endblock %}
|
|
{% endmacro %}
|