tag 3a25f16a5966f2598595322643ae776488c1b682
tagger The Android Open Source Project <initial-contribution@android.com> Mon Dec 06 20:16:30 2021 -0800
object d7db9eeddd51d3a0a9286d00abc8b08d07ffc587

Android security 10.0.0 release 61

commit d7db9eeddd51d3a0a9286d00abc8b08d07ffc587
author Raman Tenneti <rtenneti@google.com> Tue Oct 01 15:20:22 2019 -0700
committer Huizi Yang <yanghuiz@google.com> Tue Oct 15 19:12:32 2019 -0700
tree 205a7df644a3c041b065d01177eb189795285c8a
parent d2787f631e0aa4392155f69a3784a1b72c93bd16

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 a1fe2e84cfabd638e769010aa359049ea6cbf4d1)