Merge "Merge Android Pie into master"
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;
+    }
 }