summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2018-02-01 00:15:19 +0000
committerAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2018-02-01 00:15:19 +0000
commit8c3b5d27e8b665d43c81a8b82afeeb83087ccc6b (patch)
treee9f060d55dda399a01779939394aef72716afdb1
parent25afa85b84721d9028e1fe44c183cbfd2c15407d (diff)
parent19834f26ebb2e9571a981845c38fde8cfb021428 (diff)
downloadEmail-8c3b5d27e8b665d43c81a8b82afeeb83087ccc6b.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
Change-Id: Ic7701c7aca5ba6f9088ff79255776f93e6abf70f
-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;
+ }
}