summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2018-02-01 00:15:14 +0000
committerAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2018-02-01 00:15:14 +0000
commit596f06c9018650c63f2028e772b2d05d8f4b446f (patch)
treee9f060d55dda399a01779939394aef72716afdb1
parent42f254971639f92071dee2dbbc94466757624733 (diff)
parentc1201cac5f010885a0d54ff1df03b4ef49d6fa69 (diff)
downloadEmail-596f06c9018650c63f2028e772b2d05d8f4b446f.tar.gz
[automerger] Disallow attaching files from our own EmailAttachmentProvider. am: 7227751994 am: b25353dc4e am: 482541bde9 am: 3e7c9f4ad6 am: 80ba7c4c9e am: c1201cac5f
Change-Id: Id4ff5a8353f7dc58c1e083052365a3c93dac5920
-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;
+ }
}