summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-prod (mdb) <android-build-team-robot@google.com>2019-10-11 05:38:09 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-10-11 05:38:09 +0000
commit1dcdae9fb58fc8e08746c2ff84d4f8d79959a3fb (patch)
tree27fbaaef635b28b43739d4d343b7b5e396d15a27
parentf9bbd17972ca8ce9bf613f4fd70f6943a7d475f6 (diff)
parentf5a49ac9ce297b22650dc7a8748cd49be6703b5a (diff)
downloadEmail-simpleperf-release.tar.gz
Merge "Snap for 5933730 from 134e092c9b71d8145ba8c7540bac0c392630218f to simpleperf-release" into simpleperf-releasesimpleperf-release
-rw-r--r--AndroidManifest.xml36
1 files changed, 8 insertions, 28 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b4450fcc8..54235cf7e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -68,6 +68,14 @@
<uses-permission
android:name="android.permission.USE_CREDENTIALS"/>
+ <!-- Permission to get widget updates. The associated broadcast gives the
+ account and the characteristics of the folder. -->
+ <permission
+ android:name="com.android.email.permission.GET_WIDGET_UPDATE"
+ android:protectionLevel="signature"
+ android:label="@string/permission_update_widget_label"
+ android:description="@string/permission_update_widget_desc"/>
+
<!-- Grant permission to system apps to access provider (see provider below) -->
<permission
android:name="com.android.email.permission.ACCESS_PROVIDER"
@@ -107,39 +115,11 @@
<category
android:name="android.intent.category.BROWSABLE" />
</intent-filter>
- <intent-filter
- android:label="@string/app_name">
- <action
- android:name="android.intent.action.SEND" />
- <data
- android:mimeType="*/*" />
- <category
- android:name="android.intent.category.DEFAULT" />
- </intent-filter>
- <intent-filter
- android:label="@string/app_name">
- <action
- android:name="android.intent.action.SEND_MULTIPLE" />
- <data
- android:mimeType="*/*" />
- <category
- android:name="android.intent.category.DEFAULT" />
- </intent-filter>
<intent-filter>
<action
android:name="com.android.email.intent.action.REPLY" />
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.SEND" />
- <category
- android:name="android.intent.category.DEFAULT" />
- <data
- android:scheme="content"
- android:host="ui.email2.android.com"
- android:pathPrefix="/compose"
- />
- </intent-filter>
- <intent-filter>
<action android:name="android.nfc.action.NDEF_DISCOVERED" />
<category android:name="android.intent.category.DEFAULT" />
<data android:scheme="mailto" />