commit f7a4bf8f9674acbbdb1c8c90c7f8f72242c4ac76
author Sam Lee <samsmlee@google.com> Wed Mar 23 16:42:43 2016 -0700
committer The Android Automerger <android-build@google.com> Fri Mar 25 17:09:20 2016 -0700
tree 82b7b64394676101b34fac698778938c00577648
parent a2acc75c6bd263b97656ea8410568e7d38b4040c

Don't allow cachedFile Attachments if the content Uri is pointing to EmailProvider.

This is to backport a security fix reported by b/27308057 and b/27335139.
Also, add Analytics for these errors.

Bug: b/27335139
Change-Id: Iaacb34e4983cdf9a85487222ae930cb64d80a193

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;
+    }
 }