summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2018-02-01 00:15:07 +0000
committerAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2018-02-01 00:15:07 +0000
commitb25353dc4e7411d47b67e4930be2967b31ca9601 (patch)
tree35ec13da850a986a46d6daff6215b63884f75771
parent57aa11328a2f6e400da7de39f44cf51ae92bd860 (diff)
parent7227751994624bdb2ba958714cc861b8bab41634 (diff)
downloadEmail-b25353dc4e7411d47b67e4930be2967b31ca9601.tar.gz
[automerger] Disallow attaching files from our own EmailAttachmentProvider. am: 7227751994
Change-Id: I60aacd75fb35c88cf755eb7465249c8c1af734eb
-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;
+ }
}