summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Lee <samsmlee@google.com>2016-03-25 19:35:04 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-03-25 19:35:04 +0000
commit2e3f2aa116851382f612d51d7803164466eb7a35 (patch)
tree673b26d809e1e12a1556aec7d62831222aef81a9
parentd82f26fde87e3d8ad5246d536100886fc34f4db3 (diff)
parent1a7a3291d695ee41c5ff5af303c3d580d7542c9d (diff)
downloadEmail-2e3f2aa116851382f612d51d7803164466eb7a35.tar.gz
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 * commit '1a7a3291d695ee41c5ff5af303c3d580d7542c9d': Don't allow cachedFile Attachments if the content Uri is pointing to EmailProvider.
-rw-r--r--src/com/android/email/activity/ComposeActivityEmail.java6
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;
+ }
}