commit 8660be201ab7f66ec22d6ecb0f8749e05032045a
author android-build-team Robot <android-build-team-robot@google.com> Fri Feb 16 22:52:27 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Feb 16 22:52:27 2018 +0000
tree dcaeb0d9cc57f64383c5eb3a7d8e3a4707c929d9
parent 12621e8897d14f3b57eeb5ff09f6bd9cb638d202
parent 82fa511963314b58415d6fd1367f099e00858a07

Merge cherrypicks of [3628718, 3628929, 3628848, 3628813, 3628719, 3628980, 3628930, 3628931, 3628903, 3628759, 3629000, 3629001, 3629002, 3629003, 3629040, 3629041, 3629042, 3629043, 3629044, 3629045, 3628974, 3629022, 3628981, 3628849, 3628932, 3628933, 3628934, 3628935, 3628936, 3628937, 3628938, 3628939, 3629060, 3628982, 3628983, 3628984] into oc-m5-release

Change-Id: I5fd138d16b88d0e3834ddeca970c75f36554137d

src/com/android/email/activity/ComposeActivityEmail.java

diff --git a/src/com/android/email/activity/ComposeActivityEmail.java b/src/com/android/email/activity/ComposeActivityEmail.java
index cdfea0b..5783531 100644
--- a/src/com/android/email/activity/ComposeActivityEmail.java
+++ b/src/com/android/email/activity/ComposeActivityEmail.java
@@ -74,4 +74,9 @@
     protected String getEmailProviderAuthority() {
         return EmailContent.AUTHORITY;
     }
+
+    @Override
+    protected String getEmailAttachmentProviderAuthority() {
+        return EmailContent.Attachment.ATTACHMENT_PROVIDER_AUTHORITY;
+    }
 }