Commit cdc6f38e authored by Torne (Richard Coles)'s avatar Torne (Richard Coles) Committed by Commit Bot

android: upstream missed manifest changes for Q/R.

On Q+ we disabled audio capture as we have no way to selectively disable
it for incognito tabs, but this was missed when upstreaming Q.

Chrome needs QUERY_ALL_PACKAGES permission on R+ to check for any
possible intent handler for URLs. This was added downstream but missed
while upstreaming R support; add it now.

Bug: 948282, 1042023
Change-Id: I4136beddcba0227ef6cfc2073f90d645151ce6bb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2507575Reviewed-by: default avatarDavid Trainor <dtrainor@chromium.org>
Reviewed-by: default avatarTheresa  <twellington@chromium.org>
Commit-Queue: Richard Coles <torne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#823642}
parent 9d105d0e
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
<uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/> <uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/>
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/> <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
<uses-permission android:name="android.permission.NFC"/> <uses-permission android:name="android.permission.NFC"/>
<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"/>
<uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/> <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
<uses-permission android:name="android.permission.READ_SYNC_STATS"/> <uses-permission android:name="android.permission.READ_SYNC_STATS"/>
...@@ -64,6 +65,7 @@ ...@@ -64,6 +65,7 @@
<uses-permission-sdk-23 android:name="android.permission.USE_FINGERPRINT"/> <uses-permission-sdk-23 android:name="android.permission.USE_FINGERPRINT"/>
<uses-sdk android:minSdkVersion="24" android:targetSdkVersion="30"/> <uses-sdk android:minSdkVersion="24" android:targetSdkVersion="30"/>
<application <application
android:allowAudioPlaybackCapture="false"
android:allowBackup="false" android:allowBackup="false"
android:extractNativeLibs="false" android:extractNativeLibs="false"
android:icon="@drawable/ic_launcher" android:icon="@drawable/ic_launcher"
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
<uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/> <uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/>
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/> <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
<uses-permission android:name="android.permission.NFC"/> <uses-permission android:name="android.permission.NFC"/>
<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"/>
<uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/> <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
<uses-permission android:name="android.permission.READ_SYNC_STATS"/> <uses-permission android:name="android.permission.READ_SYNC_STATS"/>
...@@ -64,6 +65,7 @@ ...@@ -64,6 +65,7 @@
<uses-permission-sdk-23 android:name="android.permission.USE_FINGERPRINT"/> <uses-permission-sdk-23 android:name="android.permission.USE_FINGERPRINT"/>
<uses-sdk android:minSdkVersion="29" android:targetSdkVersion="30"/> <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="30"/>
<application <application
android:allowAudioPlaybackCapture="false"
android:allowBackup="false" android:allowBackup="false"
android:extractNativeLibs="false" android:extractNativeLibs="false"
android:icon="@drawable/ic_launcher" android:icon="@drawable/ic_launcher"
......
...@@ -53,6 +53,7 @@ by a child template that "extends" this file. ...@@ -53,6 +53,7 @@ by a child template that "extends" this file.
<uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/> <uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/>
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/> <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
<uses-permission android:name="android.permission.NFC"/> <uses-permission android:name="android.permission.NFC"/>
<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"/>
<uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/> <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
<uses-permission android:name="android.permission.READ_SYNC_STATS"/> <uses-permission android:name="android.permission.READ_SYNC_STATS"/>
...@@ -176,6 +177,7 @@ by a child template that "extends" this file. ...@@ -176,6 +177,7 @@ by a child template that "extends" this file.
android:allowBackup="false" android:allowBackup="false"
{% endif %} {% endif %}
android:networkSecurityConfig="@xml/network_security_config" android:networkSecurityConfig="@xml/network_security_config"
android:allowAudioPlaybackCapture="false"
{% block extra_application_attributes %}{% endblock %}> {% block extra_application_attributes %}{% endblock %}>
{% macro application_definitions() %} {% macro application_definitions() %}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment