diff options
| author | Raman Tenneti <rtenneti@google.com> | 2019-10-01 15:16:52 -0700 |
|---|---|---|
| committer | Huizi Yang <yanghuiz@google.com> | 2019-10-08 14:05:32 -0700 |
| commit | 88c1efd1068820b2641b9e4de03a327111de65fb (patch) | |
| tree | 104c0b88b84409b1a2137549b98f774bca8a3653 | |
| parent | 941aec516beb1ac782c2c55d96a0833698d82674 (diff) | |
| download | UnifiedEmail-88c1efd1068820b2641b9e4de03a327111de65fb.tar.gz | |
AOSP/UnifiedEmail - bug fix: do not allow composing message with hidden private data attachments - Switch intent filtering to be blacklist based rather than whitelist based.android-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41security-oc-releaseoreo-security-release
+ Make EXTRA_IN_REFERENCE_TO_MESSAGE_URI public.
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: I96273160e81f77f4746b79674129ee438440e724
(cherry picked from commit 81dd2b2769d6371dada99cc18028a329bc000b05)
| -rw-r--r-- | src/com/android/mail/compose/ComposeActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/mail/compose/ComposeActivity.java b/src/com/android/mail/compose/ComposeActivity.java index 644ded119..b4805f690 100644 --- a/src/com/android/mail/compose/ComposeActivity.java +++ b/src/com/android/mail/compose/ComposeActivity.java @@ -247,7 +247,7 @@ public class ComposeActivity extends AppCompatActivity private static final String EXTRA_IN_REFERENCE_TO_MESSAGE = "in-reference-to-message"; // If this is a reply/forward then this extra will hold a uri we must query // to get the original message. - protected static final String EXTRA_IN_REFERENCE_TO_MESSAGE_URI = "in-reference-to-message-uri"; + public static final String EXTRA_IN_REFERENCE_TO_MESSAGE_URI = "in-reference-to-message-uri"; // If this is an action to edit an existing draft message, this extra will hold the // draft message private static final String ORIGINAL_DRAFT_MESSAGE = "original-draft-message"; |