diff options
| author | Raman Tenneti <rtenneti@google.com> | 2019-06-28 17:55:34 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-28 17:55:34 -0700 |
| commit | 56b7e4558e3f4830965b884e410d1c8386794a67 (patch) | |
| tree | 37701a32055d295609ff8bc2c858e6e29f9ba5f2 | |
| parent | f7005dabcddf646f3ff22685f12affbb91e5a6f0 (diff) | |
| parent | 721f9c585cc8b4cfda0e3341792d65add4d20b58 (diff) | |
| download | Email-56b7e4558e3f4830965b884e410d1c8386794a67.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
am: 721f9c585c
Change-Id: Idbfd7118d1cce7ee48e17f7d8cfe51aeb9ade265
| -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); |