diff options
author | Ekin Oguz <ekinoguz@google.com> | 2018-01-29 13:11:35 -0800 |
---|---|---|
committer | Ekin Oguz <ekinoguz@google.com> | 2018-01-31 16:14:36 -0800 |
commit | 7227751994624bdb2ba958714cc861b8bab41634 (patch) | |
tree | 79d0449bddf6cb49f33d9a1784c69d36dd32eed0 | |
parent | e33dde450bd3aa4ed24d80eb79333044ddb6c141 (diff) | |
download | Email-7227751994624bdb2ba958714cc861b8bab41634.tar.gz |
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
-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; + } } |