summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2018-02-01 00:15:10 +0000
committerAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2018-02-01 00:15:10 +0000
commit3e7c9f4ad626022830036c66a51d766b6872a28e (patch)
treef2dd5f9cadd9de25a056540b469823ddcc7bc6a7
parentb5d75c8af5d455c530ca10196d6cba31cd57e7e9 (diff)
parent482541bde926b6054dc9fe7597e5942549ed6d93 (diff)
downloadEmail-3e7c9f4ad626022830036c66a51d766b6872a28e.tar.gz
[automerger] Disallow attaching files from our own EmailAttachmentProvider. am: 7227751994 am: b25353dc4e am: 482541bde9
Change-Id: I949a801bdcf326fe5c58f411c1979b6e1eb99c29
-rw-r--r--src/com/android/email/activity/ComposeActivityEmail.java5
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;
+ }
}