commit 76d32800486998942295218ddc89bdbd01c7df43
author Sam Lee <samsmlee@google.com> Fri Mar 25 19:30:06 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 25 19:30:06 2016 +0000
tree 1e5184c6c177225ac2f45089ec05f5d2b12ec8aa
parent dcb985eafe0a20e2cdc36c1882ef7104a22829ec
parent b2f69593ec1e523067dc693396832c1848c578c2

Don\'t allow cachedFile Attachments if the content Uri is pointing to EmailProvider. am: 4cd6044 am: 59cac70 am: cfa3cee
am: b2f6959

* commit 'b2f69593ec1e523067dc693396832c1848c578c2':
  Don't allow cachedFile Attachments if the content Uri is pointing to EmailProvider.

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 4f59e2c..cdfea0b 100644
--- a/src/com/android/email/activity/ComposeActivityEmail.java
+++ b/src/com/android/email/activity/ComposeActivityEmail.java
@@ -23,6 +23,7 @@
 import android.widget.EditText;
 
 import com.android.email.R;
+import com.android.emailcommon.provider.EmailContent;
 import com.android.mail.compose.ComposeActivity;
 import com.android.mail.utils.LogUtils;
 
@@ -68,4 +69,9 @@
             mBodyView.setSelection(mBodyView.getText().length());
         }
     }
+
+    @Override
+    protected String getEmailProviderAuthority() {
+        return EmailContent.AUTHORITY;
+    }
 }