diff options
author | Sam Lee <samsmlee@google.com> | 2016-03-23 16:42:43 -0700 |
---|---|---|
committer | The Android Automerger <android-build@google.com> | 2016-03-25 17:48:04 -0700 |
commit | 2791f0b33b610247ef87278862e66c6045f89693 (patch) | |
tree | 1e5184c6c177225ac2f45089ec05f5d2b12ec8aa | |
parent | c84ce2000f443ef6c7a6df6ad0b1c76abae7790b (diff) | |
download | android_packages_apps_Email-2791f0b33b610247ef87278862e66c6045f89693.tar.gz android_packages_apps_Email-2791f0b33b610247ef87278862e66c6045f89693.tar.bz2 android_packages_apps_Email-2791f0b33b610247ef87278862e66c6045f89693.zip |
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
-rw-r--r-- | src/com/android/email/activity/ComposeActivityEmail.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/email/activity/ComposeActivityEmail.java b/src/com/android/email/activity/ComposeActivityEmail.java index 4f59e2c65..cdfea0b4c 100644 --- a/src/com/android/email/activity/ComposeActivityEmail.java +++ b/src/com/android/email/activity/ComposeActivityEmail.java @@ -23,6 +23,7 @@ import android.view.MenuItem; 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 @@ public class ComposeActivityEmail extends ComposeActivity mBodyView.setSelection(mBodyView.getText().length()); } } + + @Override + protected String getEmailProviderAuthority() { + return EmailContent.AUTHORITY; + } } |