diff options
author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-06-27 18:14:40 +0000 |
---|---|---|
committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-06-27 18:14:40 +0000 |
commit | 6b22b904fb254026e6174c9ecc097f0b436bfea8 (patch) | |
tree | 5a00d2332c6dc3e8ce8aacfa29c6ad7b722dda10 | |
parent | 33587b4e1dd2850e30c35aee0e195a0cae492b68 (diff) | |
parent | c2b3e391ba498420435f504158c2c1b3a05fbec0 (diff) | |
download | Email-6b22b904fb254026e6174c9ecc097f0b436bfea8.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
Change-Id: I613fd5a4a3ec359707812e08e90eda213d4f7b0b
-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); |