diff options
author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-06-27 18:14:44 +0000 |
---|---|---|
committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-06-27 18:14:44 +0000 |
commit | 721f9c585cc8b4cfda0e3341792d65add4d20b58 (patch) | |
tree | 568664a63e552ff22841e3d735c12246ee51e624 | |
parent | ef35412cb61ad47d064936a0e69e59333c15eaea (diff) | |
parent | ae61fe4c0a538f54cdf54a9a3a51b78468deae19 (diff) | |
download | Email-721f9c585cc8b4cfda0e3341792d65add4d20b58.tar.gz |
[automerger] AOSP/Email - Create an empty Bundle if originalExtras doesn't exit. Backporting the fix to fix NullPointerException. am: 3150b66305 am: f384b385ea am: c2b3e391ba am: 6b22b904fb am: ae61fe4c0a
Change-Id: I8dccbfc8337c888bbf7b4ba9079cc86d7b422b10
-rw-r--r-- | src/com/android/email/activity/ComposeActivityEmailExternal.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/email/activity/ComposeActivityEmailExternal.java b/src/com/android/email/activity/ComposeActivityEmailExternal.java index a5cbe9d3a..a94313a86 100644 --- a/src/com/android/email/activity/ComposeActivityEmailExternal.java +++ b/src/com/android/email/activity/ComposeActivityEmailExternal.java @@ -49,6 +49,9 @@ public class ComposeActivityEmailExternal extends ComposeActivityEmail { 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); |