diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-02-02 14:54:03 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-02 14:54:03 +0000 |
| commit | 45a74ef5bce7a60a3400d14ad88c743eb91fcd37 (patch) | |
| tree | 79fa889eaf0adbb53b8c28913f91758e510a4642 | |
| parent | 81f896a4fa5f553ba640530beecddf74df12a49c (diff) | |
| parent | d86400d416109846c898f95c8e833bc5f9dd0478 (diff) | |
| download | Email-45a74ef5bce7a60a3400d14ad88c743eb91fcd37.tar.gz | |
[automerger] Disallow attaching files from our own EmailAttachmentProvider. am: 7227751994 am: b25353dc4e am: 482541bde9 am: 3e7c9f4ad6 am: 80ba7c4c9e am: c1201cac5f am: 596f06c901 am: 33b4e05119 am: ad7d74cf31 am: 19834f26eb am: 8c3b5d27e8 am: dd1f253020 am: 9fc843769c am: d0c2a73f27
am: d86400d416
Change-Id: If194c0633d4926d363cdc6369ca91f2841467f3d
| -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; + } } |