Commit 4b76154d authored by Sadrul Chowdhury's avatar Sadrul Chowdhury Committed by Commit Bot

Revert "android: upstream missed manifest changes for Q/R."

This reverts commit cdc6f38e.

Reason for revert: Build failures for perf bots
https://ci.chromium.org/p/chrome/builders/ci/android-builder-perf

Original change's description:
> 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/+/2507575
> Reviewed-by: David Trainor <dtrainor@chromium.org>
> Reviewed-by: Theresa  <twellington@chromium.org>
> Commit-Queue: Richard Coles <torne@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#823642}

TBR=dtrainor@chromium.org,torne@chromium.org,twellington@chromium.org,agrieve@chromium.org

Change-Id: Ib9257619c4b75a729996f17b40c403235f452848
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 948282
Bug: 1042023
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2518938Reviewed-by: default avatarSadrul Chowdhury <sadrul@chromium.org>
Commit-Queue: Sadrul Chowdhury <sadrul@chromium.org>
Cr-Commit-Position: refs/heads/master@{#823856}
parent d443e897
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
<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"/>
...@@ -65,7 +64,6 @@ ...@@ -65,7 +64,6 @@
<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,7 +38,6 @@ ...@@ -38,7 +38,6 @@
<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"/>
...@@ -65,7 +64,6 @@ ...@@ -65,7 +64,6 @@
<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,7 +53,6 @@ by a child template that "extends" this file. ...@@ -53,7 +53,6 @@ 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"/>
...@@ -177,7 +176,6 @@ by a child template that "extends" this file. ...@@ -177,7 +176,6 @@ 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