summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-03-29Revert "Move Email to androidx."android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devFilip Pavlis
Bug: 76692459 This reverts commit 838b195b3495f7be9edf460294fbef8745b35b28. Change-Id: If7b9e2cf11ba537680ff4c2f550823b9224e1705
2018-03-29Move Email to androidx.Filip Pavlis
Bug: 76692459 Test: make -j Email Change-Id: I8c358df31ed578fe77b5962973d09e5c26239255
2018-03-02Merge "Email: Fix StoreTests" am: 6eb899d47c am: c5f58810f0Andreas Gampe
am: 7cbaf2a659 Change-Id: I38915da6040113fce7efcff53443d665ddfde26b
2018-03-02Merge "Email: Fix StoreTests" am: 6eb899d47cAndreas Gampe
am: c5f58810f0 Change-Id: Ibeb30a6b0c5f0b9d3e065b0daa67f01e669b63ea
2018-03-02Merge "Email: Fix StoreTests"Andreas Gampe
am: 6eb899d47c Change-Id: Ia28dc57f35788161d6f878971962cab8078b2b57
2018-03-02Merge "Email: Fix StoreTests"android-wear-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7Treehugger Robot
2018-03-01Email: Fix StoreTestsAndreas Gampe
Fix the map lookup. Found by Errorprone. Bug: 73288226 Test: m javac-check RUN_ERROR_PRONE=true Change-Id: I6ea660221e7b123b759ca9c0bf605d7311544ea4
2018-02-02[automerger] Disallow attaching files from our own EmailAttachmentProvider. ↵Android Build Merger (Role)
am: 7227751994 am: b25353dc4e am: 482541bde9 am: 3e7c9f4ad6 am: 80ba7c4c9e am: c1201cac5f am: 596f06c901 am: 33b4e05119 am: ad7d74cf31 am: 19834f26eb am: 8c3b5d27e8 am: dd1f253020 am: 9fc843769c am: d0c2a73f27 am: d86400d416 Change-Id: If194c0633d4926d363cdc6369ca91f2841467f3d
2018-02-02[automerger] Disallow attaching files from our own EmailAttachmentProvider. ↵Android Build Merger (Role)
am: 7227751994 am: b25353dc4e am: 482541bde9 am: 3e7c9f4ad6 am: 80ba7c4c9e am: c1201cac5f am: 596f06c901 am: 33b4e05119 am: ad7d74cf31 am: 19834f26eb am: 8c3b5d27e8 am: dd1f253020 am: 9fc843769c am: d0c2a73f27 Change-Id: I5ec6374960d2d9237103a70d0866b7d7336eaf9d
2018-02-02[automerger] Disallow attaching files from our own EmailAttachmentProvider. ↵Android Build Merger (Role)
am: 7227751994 am: b25353dc4e am: 482541bde9 am: 3e7c9f4ad6 am: 80ba7c4c9e am: c1201cac5f am: 596f06c901 am: 33b4e05119 am: ad7d74cf31 am: 19834f26eb am: 8c3b5d27e8 am: dd1f253020 am: 9fc843769c Change-Id: I0018f95cea0019fbdf4e6ed0fc1ef7625144adcc
2018-02-02[automerger] Disallow attaching files from our own EmailAttachmentProvider. ↵Android Build Merger (Role)
am: 7227751994 am: b25353dc4e am: 482541bde9 am: 3e7c9f4ad6 am: 80ba7c4c9e am: c1201cac5f am: 596f06c901 am: 33b4e05119 am: ad7d74cf31 am: 19834f26eb am: 8c3b5d27e8 am: dd1f253020 Change-Id: I8f07288a2af92be13a758b6ddd10da869964a9ee
2018-02-01[automerger] Disallow attaching files from our own EmailAttachmentProvider. ↵Android Build Merger (Role)
am: 7227751994 am: b25353dc4e am: 482541bde9 am: 3e7c9f4ad6 am: 80ba7c4c9e am: c1201cac5f am: 596f06c901 am: 33b4e05119 am: ad7d74cf31 am: 19834f26eb am: 8c3b5d27e8 Change-Id: I0cb9acc6b8ef8531875ec034fa286508d854b6ed
2018-02-01[automerger] Disallow attaching files from our own EmailAttachmentProvider. ↵Android Build Merger (Role)
am: 7227751994 am: b25353dc4e am: 482541bde9 am: 3e7c9f4ad6 am: 80ba7c4c9e am: c1201cac5f am: 596f06c901 am: 33b4e05119 am: ad7d74cf31 am: 19834f26eb Change-Id: Ic7701c7aca5ba6f9088ff79255776f93e6abf70f
2018-02-01[automerger] Disallow attaching files from our own EmailAttachmentProvider. ↵Android Build Merger (Role)
am: 7227751994 am: b25353dc4e am: 482541bde9 am: 3e7c9f4ad6 am: 80ba7c4c9e am: c1201cac5f am: 596f06c901 am: 33b4e05119 am: ad7d74cf31 Change-Id: Ibc3ffcce22a198596baeef865c653b226092d69f
2018-02-01[automerger] Disallow attaching files from our own EmailAttachmentProvider. ↵Android Build Merger (Role)
am: 7227751994 am: b25353dc4e am: 482541bde9 am: 3e7c9f4ad6 am: 80ba7c4c9e am: c1201cac5f am: 596f06c901 am: 33b4e05119 Change-Id: I91302519341fefcacfb1b646269a6cca186da0f4
2018-02-01[automerger] Disallow attaching files from our own EmailAttachmentProvider. ↵Android Build Merger (Role)
am: 7227751994 am: b25353dc4e am: 482541bde9 am: 3e7c9f4ad6 am: 80ba7c4c9e am: c1201cac5f am: 596f06c901 Change-Id: Ia7d6d7a16b8daf4ee6d10f55a986847ae819fcee
2018-02-01[automerger] Disallow attaching files from our own EmailAttachmentProvider. ↵Android Build Merger (Role)
am: 7227751994 am: b25353dc4e am: 482541bde9 am: 3e7c9f4ad6 am: 80ba7c4c9e am: c1201cac5f Change-Id: Id4ff5a8353f7dc58c1e083052365a3c93dac5920
2018-02-01[automerger] Disallow attaching files from our own EmailAttachmentProvider. ↵Android Build Merger (Role)
am: 7227751994 am: b25353dc4e am: 482541bde9 am: 3e7c9f4ad6 am: 80ba7c4c9e Change-Id: I901b52fceefd47ff37c13c0e726ea7721a2eac62
2018-02-01[automerger] Disallow attaching files from our own EmailAttachmentProvider. ↵Android Build Merger (Role)
am: 7227751994 am: b25353dc4e am: 482541bde9 am: 3e7c9f4ad6 Change-Id: I4363e28a39d387ea148c84ac0c539ce3d0cf439f
2018-02-01[automerger] Disallow attaching files from our own EmailAttachmentProvider. ↵Android Build Merger (Role)
am: 7227751994 am: b25353dc4e am: 482541bde9 Change-Id: I949a801bdcf326fe5c58f411c1979b6e1eb99c29
2018-02-01[automerger] Disallow attaching files from our own EmailAttachmentProvider. ↵Android Build Merger (Role)
am: 7227751994 am: b25353dc4e Change-Id: I7b0d90ecbc06710720a71263c2be5fed82f4370b
2018-02-01[automerger] Disallow attaching files from our own EmailAttachmentProvider. ↵Android Build Merger (Role)
am: 7227751994 Change-Id: I60aacd75fb35c88cf755eb7465249c8c1af734eb
2018-01-31Disallow attaching files from our own EmailAttachmentProvider.Ekin Oguz
This is to backport a security fix reported in b/71814449 and b/72569023. Fix is using the same approach as b/27308057, which is to prevent Compose from accepting URIs with our own email attachment provider. Bug: b/71814449 Change-Id: Ib9df21648d00d2ef2da9fac05cc39fee253de8e2
2017-11-21Migrate Email to aapt2.Aurimas Liutikas
Test: None Change-Id: I201277c44a2dffc099e3ef624d330e3eb57e4cec
2017-05-24Merge "EmailTests: Use language level consistent with SDK version." am: ↵android-wear-8.0.0_r1android-o-mr1-iot-preview-6oreo-mr1-devoreo-dr1-devo-mr1-iot-preview-6Tobias Thierer
1239cd59a0 am: dfa906a0fe am: b4a41eef0c am: 1b70a229c4 Change-Id: I2709102fa0b374e6dbfe128776763d6edd99b7b6
2017-05-24Merge "EmailTests: Use language level consistent with SDK version." am: ↵android-o-mr1-preview-2android-o-mr1-preview-1Tobias Thierer
1239cd59a0 am: dfa906a0fe am: b4a41eef0c Change-Id: I8e621f7e16d0839817f66a202b47a039ed2bbb1a
2017-05-24Merge "EmailTests: Use language level consistent with SDK version." am: ↵Tobias Thierer
1239cd59a0 am: dfa906a0fe Change-Id: I908154237fdf5dd7fbe4ce21a3ef1b5ae8f9da1a
2017-05-24Merge "EmailTests: Use language level consistent with SDK version."Tobias Thierer
am: 1239cd59a0 Change-Id: I9d75533fc7889ea0c76acc27aeb871549d5007c8
2017-05-24Merge "EmailTests: Use language level consistent with SDK version."android-o-preview-4android-o-preview-3android-o-iot-preview-5o-iot-preview-5Treehugger Robot
2017-05-24EmailTests: Use language level consistent with SDK version.Tobias Thierer
Before this CL, EmailTests was built using SDK version 14 but the default LOCAL_JAVA_LANGUAGE_VERSION (currently 1.8). This breaks compilation on recent OpenJDK tool chain versions: When targeting versions >= 1.7, those generate synthetic calls to java.util.Objects.requireNonNull(), but that API is only available from Android API level 19 onwards. This CL fixes this issue by explicitly setting LOCAL_JAVA_LANGUAGE_VERSION := 1.6 rather than tracking the current default. Changing the LOCAL_SDK_VERSION to 19 would also have worked for the particular issue of Objects.requireNonNull(), but the language version and SDK used to built would then still have been inconsistent which could have led to other issues in future. If EmailTests ever needs to use later language features or APIs, the SDK version and language version can be changed to higher versions then. In the last year, packages/apps/Email has only seen one (security fix) CL. Also, 31 out of the 158 tests in EmailTests currently fail via: adb shell am instrument -w \ com.android.email.tests/android.support.test.runner.AndroidJUnitRunner Bug: 38495704 Bug: 38177295 Test: make Email EmailTests Change-Id: I7c0d10e41876dfbfcef61237ef4ca04e73409a98
2017-01-10Rename language+country resources to just languageandroid-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r4android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1oreo-vts-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-devoreo-cts-releaseRoozbeh Pournader
Bug: 26496609 Test: none Change-Id: Id6349771958a3c85523dcf384d9682b397e7b2d0
2016-08-22DO NOT MERGE Limit account id and id to longs am: 4d43d4ae1c am: 87be55a2c5 ↵Rohan Shah
am: 0f1787b8e4 -s ours am: e33dde450b -s ours am: 57aa11328a am: e411343c31 am: fe28569bf2 -s ours am: fb09c27ba3 am: b5d75c8af5 am: 8da5eddeb6 am: 956a850170 -s ours am: 42f2549716 am: 2c678233d3 am: 7b509c2890 am: 25afa85b84 am: 552ef93f45 -s ours Change-Id: I8fc870673f71404d0b829b3502516427f536e361
2016-08-22DO NOT MERGE Limit account id and id to longs am: 4d43d4ae1c am: 87be55a2c5 ↵android-wear-o-preview-4android-wear-o-preview-3android-o-preview-2android-o-preview-1android-n-mr2-preview-2android-n-mr2-preview-1android-n-iot-preview-4o-previewn-iot-preview-4Rohan Shah
am: 0f1787b8e4 -s ours am: e33dde450b -s ours am: 57aa11328a am: e411343c31 am: fe28569bf2 -s ours am: fb09c27ba3 am: b5d75c8af5 am: 8da5eddeb6 am: 956a850170 -s ours am: 42f2549716 am: 2c678233d3 am: 7b509c2890 am: 25afa85b84 Change-Id: If767737c813fce72bfed78bae0553cfbd79b9447
2016-08-22DO NOT MERGE Limit account id and id to longs am: 4d43d4ae1c am: 87be55a2c5 ↵android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1nougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devRohan Shah
am: 0f1787b8e4 -s ours am: e33dde450b -s ours am: 57aa11328a am: e411343c31 am: fe28569bf2 -s ours am: fb09c27ba3 am: b5d75c8af5 am: 8da5eddeb6 am: 956a850170 -s ours am: 42f2549716 am: 2c678233d3 am: 7b509c2890 Change-Id: Idc8c20d79d6c17eed8d299b1336dc58fbb5d6496
2016-08-22DO NOT MERGE Limit account id and id to longs am: 4d43d4ae1c am: 87be55a2c5 ↵nougat-mr1-devRohan Shah
am: 0f1787b8e4 -s ours am: e33dde450b -s ours am: 57aa11328a am: e411343c31 am: fe28569bf2 -s ours am: fb09c27ba3 am: b5d75c8af5 am: 8da5eddeb6 am: 956a850170 -s ours am: 42f2549716 am: 2c678233d3 Change-Id: I9492da0fd8f2c12571e9a183e6491de5c2f46c3f
2016-08-22DO NOT MERGE Limit account id and id to longs am: 4d43d4ae1c am: 87be55a2c5 ↵Rohan Shah
am: 0f1787b8e4 -s ours am: e33dde450b -s ours am: 57aa11328a am: e411343c31 am: fe28569bf2 -s ours am: fb09c27ba3 am: b5d75c8af5 am: 8da5eddeb6 am: 956a850170 -s ours am: 42f2549716 am: d59e13c305 am: aeb779ead9 -s ours Change-Id: Ic231d088174d4a70342e48b7b4d177c8e728c62b
2016-08-22DO NOT MERGE Limit account id and id to longs am: 4d43d4ae1c am: 87be55a2c5 ↵Rohan Shah
am: 0f1787b8e4 -s ours am: e33dde450b -s ours am: 57aa11328a am: e411343c31 am: fe28569bf2 -s ours am: fb09c27ba3 am: b5d75c8af5 am: 8da5eddeb6 am: 956a850170 -s ours am: 42f2549716 am: d59e13c305 Change-Id: I514f3673c0ea327e7a041de072a35aac56855f60
2016-08-22DO NOT MERGE Limit account id and id to longs am: 4d43d4ae1c am: 87be55a2c5 ↵Rohan Shah
am: 0f1787b8e4 -s ours am: e33dde450b -s ours am: 57aa11328a am: e411343c31 am: fe28569bf2 -s ours am: fb09c27ba3 am: b5d75c8af5 am: 8da5eddeb6 am: 956a850170 -s ours am: 42f2549716 Change-Id: I682ce21861160ffdeeeeb914968b2a1c31f725e8
2016-08-22DO NOT MERGE Limit account id and id to longs am: 4d43d4ae1c am: 87be55a2c5 ↵Rohan Shah
am: 0f1787b8e4 -s ours am: e33dde450b -s ours am: 57aa11328a am: e411343c31 am: fe28569bf2 -s ours am: fb09c27ba3 am: b5d75c8af5 am: 8da5eddeb6 am: 956a850170 -s ours am: 42f2549716 Change-Id: I17193c087ec7a2e48aed49e1e5703e8190e07f7f
2016-08-22DO NOT MERGE Limit account id and id to longs am: 4d43d4ae1c am: 87be55a2c5 ↵Rohan Shah
am: 0f1787b8e4 -s ours am: e33dde450b -s ours am: 57aa11328a am: e411343c31 am: fe28569bf2 -s ours am: fb09c27ba3 am: b5d75c8af5 am: 8da5eddeb6 am: 956a850170 -s ours Change-Id: Ibffa5650d7ee57c4df19824efdfccbfd9ef4045d
2016-08-22DO NOT MERGE Limit account id and id to longs am: 4d43d4ae1c am: 87be55a2c5 ↵Rohan Shah
am: 0f1787b8e4 -s ours am: e33dde450b -s ours am: 57aa11328a am: e411343c31 am: fe28569bf2 -s ours am: fb09c27ba3 am: b5d75c8af5 am: 8da5eddeb6 Change-Id: I6be321778f32e13e823ba244f59ee071ae358878
2016-08-22DO NOT MERGE Limit account id and id to longs am: 4d43d4ae1c am: 87be55a2c5 ↵Rohan Shah
am: 0f1787b8e4 -s ours am: e33dde450b -s ours am: 57aa11328a am: e411343c31 am: fe28569bf2 -s ours am: fb09c27ba3 am: b5d75c8af5 Change-Id: I946158738844b48866e9d5e4f17cd17ab2bf9f70
2016-08-22DO NOT MERGE Limit account id and id to longs am: 4d43d4ae1c am: 87be55a2c5 ↵Rohan Shah
am: 0f1787b8e4 -s ours am: e33dde450b -s ours am: 57aa11328a am: e411343c31 am: fe28569bf2 -s ours am: fb09c27ba3 Change-Id: Iddbf33a00472c8d6eb9992befd4efbda873d0c8a
2016-08-22DO NOT MERGE Limit account id and id to longs am: 4d43d4ae1c am: 87be55a2c5 ↵Rohan Shah
am: 0f1787b8e4 -s ours am: e33dde450b -s ours am: 57aa11328a am: e411343c31 am: fe28569bf2 -s ours Change-Id: I3773c0168b520ce1bb61ddccadff2fc4f2804ed2
2016-08-22DO NOT MERGE Limit account id and id to longs am: 4d43d4ae1c am: 87be55a2c5 ↵Rohan Shah
am: 0f1787b8e4 -s ours am: e33dde450b -s ours am: 57aa11328a am: e411343c31 Change-Id: I39d20b12cfdef8a6faefe3e1c943300402cbe3d3
2016-08-22DO NOT MERGE Limit account id and id to longs am: 4d43d4ae1c am: 87be55a2c5 ↵Rohan Shah
am: 0f1787b8e4 -s ours am: e33dde450b -s ours am: 57aa11328a Change-Id: Ie81690e2de660eec58512d1a43ffd52fedbca827
2016-08-22DO NOT MERGE Limit account id and id to longs am: 4d43d4ae1c am: 87be55a2c5 ↵Rohan Shah
am: 0f1787b8e4 -s ours am: e33dde450b -s ours Change-Id: I2da37316922f306cc9f2156016f6a62a43acb569
2016-08-22DO NOT MERGE Limit account id and id to longs am: 4d43d4ae1c am: 87be55a2c5Rohan Shah
am: 0f1787b8e4 -s ours Change-Id: Id5097ae2be27a6ade1b67469292538bffd616ca5
2016-08-22DO NOT MERGE Limit account id and id to longs am: 4d43d4ae1cRohan Shah
am: 87be55a2c5 Change-Id: Id7a231bc6408ce29b3ce6e623cfd1deb6ce05adf
2016-08-22DO NOT MERGE Limit account id and id to longsRohan Shah
am: 4d43d4ae1c Change-Id: I5d4203b5b5239d1c5a4f2715a343be3f01a7e339
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 18:19:59 +0000