diff options
| author | Ekin Oguz <ekinoguz@google.com> | 2018-01-29 13:11:35 -0800 |
|---|---|---|
| committer | Moritz Horstmann <dev@peterzweg.at> | 2018-04-06 16:05:54 +0200 |
| commit | b3978f1492291d46e1589006a2b5797427bf4e6b (patch) | |
| tree | fcd901b61197946aaba6782bfcf425ffcaab1ab6 | |
| parent | 5033c8c49157c54026f9fd67fbc2acd5d9b19fc2 (diff) | |
| download | android_packages_apps_Email-b3978f1492291d46e1589006a2b5797427bf4e6b.tar.gz android_packages_apps_Email-b3978f1492291d46e1589006a2b5797427bf4e6b.tar.bz2 android_packages_apps_Email-b3978f1492291d46e1589006a2b5797427bf4e6b.zip | |
Disallow attaching files from our own EmailAttachmentProvider.
This is to backport a security fix reported in b/71814449 and
b/72569023. Fix is using the same approach as b/27308057, which is to
prevent Compose from accepting URIs with our own email attachment
provider.
Bug: b/71814449
Change-Id: Ib9df21648d00d2ef2da9fac05cc39fee253de8e2
(cherry picked from commit 7227751994624bdb2ba958714cc861b8bab41634)
(cherry picked from commit c3e0aba2a604ce7c3807d65df1e6a2b848287019)
| -rw-r--r-- | src/com/android/email/activity/ComposeActivityEmail.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/email/activity/ComposeActivityEmail.java b/src/com/android/email/activity/ComposeActivityEmail.java index cdfea0b4c..57835315b 100644 --- a/src/com/android/email/activity/ComposeActivityEmail.java +++ b/src/com/android/email/activity/ComposeActivityEmail.java @@ -74,4 +74,9 @@ public class ComposeActivityEmail extends ComposeActivity protected String getEmailProviderAuthority() { return EmailContent.AUTHORITY; } + + @Override + protected String getEmailAttachmentProviderAuthority() { + return EmailContent.Attachment.ATTACHMENT_PROVIDER_AUTHORITY; + } } |