Snap for 5915132 from 66782b400580ec76707b7e2a5e44369c9df942f1 to qt-qpr1-release
Change-Id: Ia239fa197f9893bf27046e096fe07f3f3cb9c881
diff --git a/src/com/android/email/activity/ComposeActivityEmailExternal.java b/src/com/android/email/activity/ComposeActivityEmailExternal.java
index a94313a..07f6fe1 100644
--- a/src/com/android/email/activity/ComposeActivityEmailExternal.java
+++ b/src/com/android/email/activity/ComposeActivityEmailExternal.java
@@ -48,24 +48,8 @@
private void sanitizeIntent() {
Intent sanitizedIntent = getIntent();
if (sanitizedIntent != null) {
- Bundle originalExtras = sanitizedIntent.getExtras();
- if (originalExtras == null) {
- originalExtras = new Bundle();
- }
- sanitizedIntent.replaceExtras(new Bundle());
- copyStringExtraIfExists(ComposeActivity.EXTRA_SUBJECT, originalExtras, sanitizedIntent);
- copyStringExtraIfExists(ComposeActivity.EXTRA_TO, originalExtras, sanitizedIntent);
- copyStringExtraIfExists(ComposeActivity.EXTRA_CC, originalExtras, sanitizedIntent);
- copyStringExtraIfExists(ComposeActivity.EXTRA_BCC, originalExtras, sanitizedIntent);
- copyStringExtraIfExists(ComposeActivity.EXTRA_BODY, originalExtras, sanitizedIntent);
+ sanitizedIntent.removeExtra(ComposeActivity.EXTRA_IN_REFERENCE_TO_MESSAGE_URI);
setIntent(sanitizedIntent);
}
}
-
- private void copyStringExtraIfExists(
- String extraKey, Bundle originalExtras, Intent sanitizedIntent) {
- if (originalExtras.containsKey(extraKey)) {
- sanitizedIntent.putExtra(extraKey, originalExtras.getString(extraKey));
- }
- }
}
