tag b3d37056bcded0e14cc005e4b4af22b4b4ce2734
tagger The Android Open Source Project <initial-contribution@android.com> Tue Sep 08 15:11:06 2020 -0700
object 3ddf3cf67f0a3c4c377dfecb871e24e92193cc9a

Android 8.0.0 release 50

commit 3ddf3cf67f0a3c4c377dfecb871e24e92193cc9a
author Raman Tenneti <rtenneti@google.com> Tue Oct 01 15:20:22 2019 -0700
committer Huizi Yang <yanghuiz@google.com> Tue Oct 08 14:05:29 2019 -0700
tree 011d5c5c59bf0093855f2d0877a1b3d14f45eca2
parent 813c77dc3ff5559f297ccb713678120165189959

AOSP/Email - bug fix: do not allow composing message with hidden private data attachments - Switch intent filtering to be blacklist based rather than whitelist based.

+ Blacklist only EXTRA_IN_REFERENCE_TO_MESSAGE_URI.
+ Undoing some of the changes from https://android-review.googlesource.com/c/platform/packages/apps/Email/+/961354/
+ Ported/merged this change from CL: cl/235253805 (to match the internal version - ComposeActivityGmailExternal.java)

Bug: 127320867

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

$ make -j 40
$ make Email -j
$ make UnifiedEmailTests -j
$ make EmailTests -j

  -rw-r--r-- 1 rtenneti primarygroup 6356400 Oct  1 12:07 out/target/product/marlin/testcases/Email/arm64/Email.apk
  -rw-r--r-- 1 rtenneti primarygroup 389599 Oct  1 12:11 out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk

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

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

$ atest EmailTests
  Summary
  -------
  EmailTests: Passed: 157, Failed: 0, Ignored: 0, Assumption Failed: 0

  All tests passed!

Change-Id: I5a397b61827b82502d26da2496831011956c868a
(cherry picked from commit a03ee3224e18b7d22b494371cf78a2626626788c)