tag fc949740548b4a67692a0d9ebdfc76ff27a6aaff
tagger The Android Open Source Project <initial-contribution@android.com> Fri Oct 04 16:16:45 2019 -0700
object b498e28b882497beef4a8c2e7fb53b76be9178b6

Android 9.0.0 Release 49 (5794013)

commit b498e28b882497beef4a8c2e7fb53b76be9178b6
author Raman Tenneti <rtenneti@google.com> Tue Jun 25 18:04:39 2019 -0700
committer Arjun Garg <arjgarg@google.com> Thu Jul 11 13:05:02 2019 -0700
tree e5d1028504073837a0a6ffd4d87364abb7c315fc
parent 61081261ece50b05bf1033c13b4989c879b995bf

AOSP/Email - Create an empty Bundle if originalExtras doesn't exit. Backporting the fix to fix NullPointerException.

+ Added "originalExtras = new Bundle();" change from cl/247540041

Bug: 135889250
Bug: 127320867

Test: manual - Ran the following tests on Pixel phone. Tested the email UI.

$ make -j 40
  -rw-r--r-- 1 rtenneti primarygroup 6371530 Jun 25 17:23 out/target/product/marlin/system/product/app/Email/Email.apk

$ make EmailTests -j
  -rw-r--r-- 1 rtenneti primarygroup 365023 Jun 25 17:49 out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk

$ adb install -r out/target/product/marlin/system/product/app/Email/Email.apk

$ adb install -r out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk

$ adb shell am instrument -w com.android.email.tests
  Time: 2.986
  OK (157 tests)

Change-Id: Ica9eb7ad3ddd11c752a526c2b1d5f086c74da283
Merged-In: Ica9eb7ad3ddd11c752a526c2b1d5f086c74da283
(cherry picked from commit 3150b66305bea67a83ce289c42c85efc669088d3)