commit ebd7fc4a574de71f00ee49f56b78a41fd87402fd
author Sam Lee <samsmlee@google.com> Fri Mar 25 19:37:34 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 25 19:37:34 2016 +0000
tree dcf1166acca2f35cf7528a30eb2e4b0e6156eb86
parent 6bee168115a24c5d710e2ee8db58a6559b4292eb
parent 2e3f2aa116851382f612d51d7803164466eb7a35

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

* commit '2e3f2aa116851382f612d51d7803164466eb7a35':
  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;
+    }
 }