summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-03-15Snap for 4603989 from f1d87d06cf9c2d9a47739486fb84306643a828cc to oc-m2-releaseandroid-8.1.0_r41android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r30android-8.1.0_r26android-8.1.0_r25android-8.1.0_r20oreo-m6-s2-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-releaseandroid-build-team Robot
Change-Id: I43304d209d54a7a03a5f8607e4e1b9bdfabc6cda
2018-02-08Merge cherrypicks of [3581037, 3581038, 3580473, 3580624, 3580656, 3580657, ↵android-wear-8.1.0_r1android-8.1.0_r19oreo-mr1-wear-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingandroid-build-team Robot
3580658, 3580382, 3580474, 3580475, 3581039, 3581040, 3580476, 3580206, 3581527, 3580955, 3580956, 3580957, 3580958, 3580959, 3580960, 3580961, 3580962, 3580963, 3580964, 3580965, 3580966, 3581567, 3581568, 3581569, 3581570, 3581571, 3580625, 3580626, 3581587, 3581513, 3581514, 3581515, 3580477, 3581588, 3580659, 3580660, 3580383, 3580384, 3580478, 3580719, 3580479, 3580480, 3581385, 3581528, 3581041, 3581042, 3581043, 3581044, 3581045, 3581046, 3581607, 3580385, 3580481, 3580482, 3580483, 3580661, 3580662, 3580663, 3580664, 3580665, 3580484, 3580485, 3581608, 3581609, 3581610, 3581611, 3581612, 3581589, 3581613, 3580486, 3581519, 3581627, 3581628, 3581529, 3581530, 3581531, 3581629, 3581630] into oc-mr1-release Change-Id: Ia1cfc1b292ceeeda72fda6a64e8ce44ba40be213
2018-02-08Disallow 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: Idcc002b94bcea913383b54bcf1dc5c3e1d254ded (cherry picked from commit 44a5db2dc0ace4d360699c11c27d5c10b43ad628)
2018-02-03Merge cherrypicks of [3551537, 3552808, 3552809, 3551513, 3551514, 3554326, ↵android-build-team Robot
3555207, 3555208, 3555209, 3555210, 3552110, 3555154, 3555155] into oc-m2-release Change-Id: I50ced1da0473f15226fccb3d4e89003e362d40b7
2018-02-03Disallow 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: Idcc002b94bcea913383b54bcf1dc5c3e1d254ded (cherry picked from commit 44a5db2dc0ace4d360699c11c27d5c10b43ad628)
2017-06-18release-request-c9e3b153-009d-4386-b83e-337752602795-for-git_oc-mr1-release- ↵android-vts-8.1_r3android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r2android-cts-8.1_r1android-8.1.0_r9android-8.1.0_r8android-8.1.0_r7android-8.1.0_r6android-8.1.0_r5android-8.1.0_r4android-8.1.0_r3android-8.1.0_r2android-8.1.0_r18android-8.1.0_r17android-8.1.0_r16android-8.1.0_r15android-8.1.0_r14android-8.1.0_r13android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1oreo-mr1-s1-releaseandroid-build-team Robot
4111654 snap-temp-L22900000075285650 Change-Id: I5052b317be7432d19602b810635c026b5b34576c
2017-06-15Merge "Fix dependencies of packages that target earlier releases" am: ↵oreo-mr1-devPaul Duffin
a3efe60e6b am: 6387a14bfe am: 6087c3f339 am: a1ba486764 Change-Id: I167477f6b98edc81a45b3d74cde489415b70e9e0
2017-06-15Merge "Fix dependencies of packages that target earlier releases" am: ↵android-o-mr1-iot-preview-6o-mr1-iot-preview-6Paul Duffin
a3efe60e6b am: 6387a14bfe am: 6087c3f339 Change-Id: I3ed6301554b766c303e57f11320d9c386d4a873a
2017-06-15Merge "Fix dependencies of packages that target earlier releases" am: a3efe60e6bandroid-o-mr1-preview-2android-o-mr1-preview-1Paul Duffin
am: 6387a14bfe Change-Id: If0efffb57160316413ca9bf2a28e1d62f4cef972
2017-06-15Merge "Fix dependencies of packages that target earlier releases"Paul Duffin
am: a3efe60e6b Change-Id: Ide189e42132bf15b933899bdfeb45beb41d31afa
2017-06-15Merge "Fix dependencies of packages that target earlier releases"android-o-preview-4android-o-iot-preview-5o-iot-preview-5Paul Duffin
2017-06-13Fix dependencies of packages that target earlier releasesPaul Duffin
A previous change added legacy-android-test as a static dependency to all packages that build against the current, test_current or system_current and failed to compile when the junit and android.test classes were removed from the API. Unfortunately, those changes did not take into account that some of those packages target earlier API versions and so will always have the classes available at runtime. This change replaces those static dependencies with dynamic dependencies for any package that targets an earlier API version. The file changes were made automatically by a tool that constructed and then analyzed a full dependency graph of all the Android Java modules. The individual changes were checked manually to ensure that the changes matched the intent. The affected modules were built against an API with the junit and android.test classes removed. Any issues found during this process resulted in either the tool being updated to address the issue or a separate change being made to fix an existing problem with the build. A sample of the affected packages were run to ensure that they worked as expected at runtime; no issues were found during testing. The following change descriptions were generated automatically and so may be a little repetitive. They are provided to give the reviewer enough information to check the comments match what has actually been changed and check the reasoning behind the changes. * tests/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because UnifiedEmailTests's manifest file (AndroidManifest.xml) targets API level 19 and dynamically includes the android.test.runner library at runtime so there is no point in statically including the classes. Added 'android.test.mock.sdk' and 'legacy-android-test' to LOCAL_JAVA_LIBRARIES because module UnifiedEmailTests builds against 'LOCAL_SDK_VERSION := current' and uses classes from packages android.test and android.test.mock (possibly indirectly) so will no longer compile once they are removed from the API. Dependency 'android.test.mock.sdk' is used instead of 'android.test.mock' because module UnifiedEmailTests builds against the API not internal jars and so should use libraries that build against the API not internal jars. A future change will replace the dependency on 'legacy-android-test', which builds against the internal jars with a dependency on 'android.legacy.test' which will build against the API. Bug: 30188076 Test: make checkbuild and ran a sample of tests Change-Id: I36efe465fd52b9f7d98c57b0bfa48a7ce7d486fb
2017-06-06Remove usages of ActionBarActivity. am: f4bb971c2doreo-dr1-devAurimas Liutikas
am: cea0727289 Change-Id: I35461575b449192371b7ce89e80a8d8c89e1cdc9
2017-06-06Remove usages of ActionBarActivity.Aurimas Liutikas
am: f4bb971c2d Change-Id: Ia6589b0c1ca6cc99ecac7fa88e2782f7fbedac78
2017-06-06Remove usages of ActionBarActivity.android-vts-8.0_r2android-vts-8.0_r1oreo-devAurimas Liutikas
ActionBarActivity has been deprecated for 2+ years and has been extending AppCompatActivity for all that time. These changes should be no-ops. Bug: 35253513 Test: None Change-Id: I5d1295b253381810b8e6936705ea4bd4198a700d (cherry picked from commit 69951ecebbf58d0d2ea41c3200174e9ebe91e964)
2017-06-06Remove usages of ActionBarActivity. am: e094f5d4bcAurimas Liutikas
am: e6fef2550d Change-Id: I9fac54fe9283868e7dcbc2afebc2b6ba19ef3bc8
2017-06-06Remove usages of ActionBarActivity.Aurimas Liutikas
am: e094f5d4bc Change-Id: Ic98ad09de631614665c73007b8d7bceff5ed5048
2017-06-05Remove usages of ActionBarActivity.Aurimas Liutikas
ActionBarActivity has been deprecated for 2+ years and has been extending AppCompatActivity for all that time. These changes should be no-ops. Bug: 35253513 Test: None Change-Id: Ic5fdb48f000aea23f6f5ec58a460fd74b6a8690a (cherry picked from commit 4facd1a92e9da980156a0fa31867591930cde190)
2017-05-23release-request-f2cd0207-2ed0-4e33-859f-0df0378165b1-for-git_oc-mr1-release- ↵android-build-team Robot
4033857 snap-temp-L00900000066751756 Change-Id: I9bb3863f9c04d242925ecee60d9a2c2cc106bf19
2017-05-21release-request-91ef8626-1af7-4595-b2bd-2d85ee97e99f-for-git_oc-mr1-release- ↵android-build-team Robot
4029936 snap-temp-L27200000066301195 Change-Id: I9554d4e74df840e95891464dd3503b27cc525c5b
2017-05-19Remove usages of ActionBarActivity.Aurimas Liutikas
ActionBarActivity has been deprecated for 2+ years and has been extending AppCompatActivity for all that time. These changes should be no-ops. Bug: 35253513 Test: None Change-Id: Ic5fdb48f000aea23f6f5ec58a460fd74b6a8690a
2017-05-18Remove usages of ActionBarActivity.Aurimas Liutikas
ActionBarActivity has been deprecated for 2+ years and has been extending AppCompatActivity for all that time. These changes should be no-ops. Bug: 35253513 Test: None Change-Id: I5d1295b253381810b8e6936705ea4bd4198a700d
2017-05-17release-request-655284b0-7f0b-48b5-b01d-27f48a99f2c0-for-git_oc-mr1-release- ↵android-build-team Robot
4017105 snap-temp-L82600000064873863 Change-Id: I469be93374b5b974d56eac7534ff828b91faf4a2
2017-05-11Merge "Preference headers layout has been fixed" am: 9171c25f7d am: ↵Tony Mantler
7e8ff2694e am: 1de9fa3bed am: b6647d362d Change-Id: I2be9aea85223d849a5dff96fce9b6da05183bf02
2017-05-11Merge "Preference headers layout has been fixed" am: 9171c25f7d am: 7e8ff2694eTony Mantler
am: 1de9fa3bed Change-Id: I55feb81966eb81ab4787dd9e165c91cbe52d90ec
2017-05-11Merge "Preference headers layout has been fixed" am: 9171c25f7dTony Mantler
am: 7e8ff2694e Change-Id: Ifa38fe77fcf6d586ea85782665a3d6d01db19853
2017-05-11Merge "Preference headers layout has been fixed"Tony Mantler
am: 9171c25f7d Change-Id: Ic9f90e0b4fa521ca671c0c0c2ae5888b50f3eeb1
2017-05-11Merge "Preference headers layout has been fixed"android-o-preview-3android-n-iot-preview-4n-iot-preview-4Tony Mantler
2017-04-05Preference headers layout has been fixedAnatoliy Shuba
Test: resources builds fine Change-Id: I090648913f52aaa09f3af5c7124e138870da6dfa Signed-off-by: Anatoliy Shuba <anatoliy.shuba@gmail.com>
2017-04-05Update interface signature am: 64b1537368Alan Viverette
am: c651e60676 Change-Id: I0ffcc7665641d7ddd4b33954fdee7a3cd811b644
2017-04-05Update interface signatureAlan Viverette
am: 64b1537368 Change-Id: If2180a1bb95f0a3ea89999ced275cee21478a158
2017-04-03Update interface signatureAlan Viverette
Bug: 24137209 Test: make tests -j32 Change-Id: I317b6e93693c012938a9e915964ff81a20e23c49
2017-03-01Add basic support for virtual files to Email.Tomasz Mikolajewski
It's basic support which allows users to attach virtual files in the first provided streamable format, usually PDF. Bug: 33609522 Test: Tested manually by attaching a sheets document. Change-Id: Ie75beaadb822c1e97e47c0972447114387e203e5
2017-02-28Fix tests for apps/UnifiedEmail.Tomasz Mikolajewski
They stopped compiling due to changes in O. Issues fixed: - Handler created on a thread without Looper. - Method not visible from userdebug built tests. - Exception thrown due to mismatching authorities in ContentProvider. Test: The tests compile and pass. Bug: 33609522 Change-Id: Ibe74c1d2f7c9a3cb16839ad0db1117146757c523
2017-01-18Merge "Prepare for removal of legacy-test from default targets" am: ↵Paul Duffin
6946d8aae5 am: e7cfbd5cf6 am: 5575c333d3 am: 5c504aac78 Change-Id: I77bdb8afde619f9966972e802e479e02e0ebae50
2017-01-18Merge "Prepare for removal of legacy-test from default targets" am: ↵android-wear-o-preview-4android-wear-o-preview-3android-o-preview-2Paul Duffin
6946d8aae5 am: e7cfbd5cf6 am: 5575c333d3 Change-Id: I4a0b3a6eef374f08ac1563313556d8e6d1612da9
2017-01-18Merge "Prepare for removal of legacy-test from default targets" am: 6946d8aae5Paul Duffin
am: e7cfbd5cf6 Change-Id: I3f06ff492f15894b8485593a51a8582f5cbb0286
2017-01-18Merge "Prepare for removal of legacy-test from default targets"Paul Duffin
am: 6946d8aae5 Change-Id: Iad4f18e7457becc3a6f8705669ea91ffa9ab7628
2017-01-18Merge "Prepare for removal of legacy-test from default targets"android-o-preview-1android-n-mr2-preview-2o-previewTreehugger Robot
2017-01-17Prepare for removal of legacy-test from default targetsPaul Duffin
In preparation for removing junit classes from the Android API the legacy-test target will be removed from the TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit dependencies on junit and/or legacy-android-test to ensure that modules will compile properly once it is removed. Bug: 30188076 Test: make checkbuild Change-Id: I53f5e21f10ad862fe847389884c8107ff260a53e
2017-01-10Rename language+country resources to just languageRoozbeh Pournader
Bug: 26496609 Test: none Change-Id: I9af72273a70ec304d4c4599e10ca463e60bda920
2016-12-06Don't allow file attachment from /data through GET_CONTENT. am: eace8b43e8 ↵Ekin Oguz
am: d21eae6d32 am: ef87f57acc am: 09e62336e5 am: 15c7da491d am: 7e2e3d56c2 am: c8df179fe7 am: 31240122aa am: cce602a7ba am: eb85a2e10e am: 7caf02c824 am: 067b94d04a am: 51e73e6ca9 Change-Id: I9d40ac800a56273cf14d988f644dc85132e3cd95
2016-12-06Don't allow file attachment from /data through GET_CONTENT. am: eace8b43e8 ↵Ekin Oguz
am: d21eae6d32 am: ef87f57acc am: 09e62336e5 am: 15c7da491d am: 7e2e3d56c2 am: c8df179fe7 am: 31240122aa am: cce602a7ba am: eb85a2e10e am: 7caf02c824 am: 785fcc7924 am: d3fdbff842 Change-Id: Icd4b5745a6dc6b25e76b3d17947fbc3917d86989
2016-12-06Don't allow file attachment from /data through GET_CONTENT. am: eace8b43e8 ↵Ekin Oguz
am: d21eae6d32 am: ef87f57acc am: 09e62336e5 am: 15c7da491d am: 7e2e3d56c2 am: c8df179fe7 am: 31240122aa am: cce602a7ba am: eb85a2e10e am: 7caf02c824 am: 067b94d04a Change-Id: I20b0a8c3f4e62dd050bd512cc63266914ae85253
2016-12-06Don't allow file attachment from /data through GET_CONTENT. am: eace8b43e8 ↵Ekin Oguz
am: d21eae6d32 am: ef87f57acc am: 09e62336e5 am: 15c7da491d am: 7e2e3d56c2 am: c8df179fe7 am: 31240122aa am: cce602a7ba am: eb85a2e10e am: 7caf02c824 am: 785fcc7924 Change-Id: Ieb98bceff703664c34a8503fde651fa3f45767a1
2016-12-06Don't allow file attachment from /data through GET_CONTENT. am: eace8b43e8 ↵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-devEkin Oguz
am: d21eae6d32 am: ef87f57acc am: 09e62336e5 am: 15c7da491d am: 7e2e3d56c2 am: c8df179fe7 am: 31240122aa am: cce602a7ba am: eb85a2e10e am: 7caf02c824 Change-Id: Ic363b26fdae41e8c22c51e94a97cad56eda80e2c
2016-12-06Don't allow file attachment from /data through GET_CONTENT. am: eace8b43e8 ↵Ekin Oguz
am: d21eae6d32 am: ef87f57acc am: 09e62336e5 am: 15c7da491d am: 7e2e3d56c2 am: c8df179fe7 am: 31240122aa am: cce602a7ba am: eb85a2e10e am: 7caf02c824 Change-Id: I4bae0332a5a0e3c262454d1a7632b99cb5196146
2016-12-06Don't allow file attachment from /data through GET_CONTENT. am: eace8b43e8 ↵Ekin Oguz
am: d21eae6d32 am: ef87f57acc am: 09e62336e5 am: 15c7da491d am: 7e2e3d56c2 am: c8df179fe7 am: 31240122aa am: cce602a7ba am: eb85a2e10e Change-Id: Ied10ff24f2dad02688ed652af91d199722ca3271
2016-12-06Don't allow file attachment from /data through GET_CONTENT. am: eace8b43e8 ↵Ekin Oguz
am: d21eae6d32 am: ef87f57acc am: 09e62336e5 am: 15c7da491d am: 7e2e3d56c2 am: c8df179fe7 am: 31240122aa am: cce602a7ba Change-Id: I8e946ed1fecd6bff052feccac959919d8475075a
2016-12-06Don't allow file attachment from /data through GET_CONTENT. am: eace8b43e8 ↵Ekin Oguz
am: d21eae6d32 am: ef87f57acc am: 09e62336e5 am: 15c7da491d am: 7e2e3d56c2 am: c8df179fe7 am: 31240122aa Change-Id: I42da1d4b38e44981c4f4a4c79ac3625eae5cee82
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 01:47:53 +0000