aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-03-22Merge cherrypicks of [3782287, 3782954, 3783025, 3783026, 3783027, 3783028, ↵android-8.1.0_r42android-8.1.0_r40android-8.1.0_r39android-8.1.0_r38android-8.1.0_r37android-8.1.0_r32android-8.1.0_r31oreo-m4-s9-releaseoreo-m4-s8-releaseoreo-m4-s7-releaseoreo-m4-s6-releaseoreo-m4-s5-releaseoreo-m4-s11-releaseoreo-m4-s10-releaseandroid-build-team Robot
3783029, 3783030, 3783164, 3783165, 3783167, 3783168, 3783170, 3783171, 3783172, 3782288, 3783031, 3782196, 3782955] into oc-m4-release Change-Id: Ic23c66ec8ccf12d038f74202f2380ad232d3150b
2018-03-22DO NOT MERGE Add test for calling SSLEngine with multiple inputs.Adam Vartanian
Bug: 73251618 Test: cts -m CtsLibcoreTestCases -t libcore.javax.net.ssl Change-Id: I021ef1bd21d9046e132111221d8f7e94b7e83a4d (cherry picked from commit 95c2d02257246e0b87f38efc56fa325a94388c32)
2018-03-21Snap for 4657601 from 2f52a567e236541eae716c29d7ef8b4d65b6d7f7 to oc-m4-releaseandroid-build-team Robot
Change-Id: I6788fe5070151f12d9393b0c633d6093a22041d9
2018-02-26Snap for 4565141 from f21d34928a714fcf5556d99b91f2aaca59e69964 to oc-m4-releaseandroid-8.1.0_r23oreo-m4-s1-releaseandroid-build-team Robot
Change-Id: If5ad8c3bc80227834b14927f2801e3ef67894546
2018-01-05Snap for 4527419 from f21d34928a714fcf5556d99b91f2aaca59e69964 to oc-m2-releaseandroid-8.1.0_r20oreo-m2-releaseandroid-build-team Robot
Change-Id: I90f53384d125980c66d5a592a50baf280207080a
2017-12-14Merge cherrypicks of [3365569, 3365570, 3366860, 3366878, 3365571, 3365572, ↵android-wear-8.1.0_r1android-8.1.0_r19android-8.1.0_r16android-8.1.0_r15android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10oreo-mr1-wear-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingandroid-build-team Robot
3366918, 3365573, 3365589, 3365590, 3366938, 3366902, 3365574, 3365575, 3365576, 3365577, 3366958, 3365824, 3365591, 3366959, 3366960, 3366961, 3366962, 3366963, 3366964, 3366965, 3366919, 3366966, 3366967, 3366968, 3366969, 3366970, 3367018, 3367019, 3365592, 3365593, 3366985, 3365825, 3366988, 3366989, 3366990, 3366991, 3366992, 3366993, 3366994, 3367004, 3367005, 3367006, 3367007, 3367008, 3367009, 3367010, 3367011, 3367012, 3367013, 3367014, 3367015, 3367016, 3367017, 3367038, 3367039, 3367040, 3367041, 3367042, 3367044, 3367045, 3367046, 3367049, 3367050, 3367052, 3367053, 3367054, 3367055, 3367056, 3366920, 3366921, 3366922, 3367079] into oc-mr1-release Change-Id: I37f1965e04bfe869a4f9e70adf2e8a5a3502b27e
2017-12-14Add test that extra buffer space is ignored.Adam Vartanian
Bug: 69349260 Test: vogar libcore.javax.crypto.spec.KeyFactoryTestRSA Change-Id: I2d3560d60490f5d9710cd10d686edf8f6c6c532a (cherry picked from commit 37f045d4742de0b0a5dfde4afb4a161d2079d5be)
2017-10-09Snap for 4384531 from 6b815ed6cde82df78ed12a60e4b9acfcc3fe9412 to oc-m2-releaseandroid-8.1.0_r8android-8.1.0_r2android-build-team Robot
Change-Id: I64b308872e98ff396ac1efcf9ea5ba723e10ab7e
2017-10-05Snap for 4378450 from 1640b11922f2c447cca87453d7be5dde6014e2f1 to oc-mr1-releaseandroid-cts-8.1_r1android-8.1.0_r6android-8.1.0_r5android-8.1.0_r4android-8.1.0_r3android-8.1.0_r1android-build-team Robot
Change-Id: I7bdb942985eb285bdd246ead2feeb095b15d2faf
2017-10-04Merge "Fix API level in SimpleDateFormat documentation." into oc-mr1-devJoachim Sauer
2017-10-04Further checks for error coditions in linux.io.Linux JNIPrzemyslaw Szczepaniak
Test: make & flash Bug: 66910813 Change-Id: Ided44139628b938372941bf9dc7812490dfdf396 (cherry picked from commit fe1c2f9ea0666a129a25b7806c2f9e7af2daf4ba)
2017-10-03Fix API level in SimpleDateFormat documentation.Joachim Sauer
SimpleDateFormat JavaDoc claims that Y and X are supported starting from API level 1, which is wrong, both of these pattern characters (and u, which is correctly marked) were added in API level 24. Bug: 66965622 Test: m (doc only change) (cherry picked from commit 4772860a6a2e4b4a64747c82a51a968ec08f7e13) Change-Id: I4c5f10bca8449fc0f39df8ec6bf26cf6186cb995
2017-09-29release-request-99856c15-b008-4977-9971-f86523a23c0a-for-git_oc-m2-release-4 ↵android-build-team Robot
367109 snap-temp-L18300000107415568 Change-Id: I6555093edf05e4a49e1c69202e7c88b45b5f7192
2017-09-28release-request-ca7a0f27-e01e-4493-95dc-73b265f88cc9-for-git_oc-mr1-release- ↵android-build-team Robot
4365318 snap-temp-L33600000106883904 Change-Id: Ie86e360dab60dd6104a8a056a388eacd8374516c
2017-09-27Add missing checks for error coditions in linux.io.Linux JNIPrzemyslaw Szczepaniak
Test: make & flash Bug: 66907045 Bug: 66910813 Change-Id: Iaca77f5df448ea3839e89f275e91c0a60fdd0601 (cherry picked from commit 93a973589d69b7e4a725c058761b79a5d6600796)
2017-09-27Update java.util.Locale with Oreo release name am: 63552f3347Przemyslaw Szczepaniak
am: 37d90a4b73 Change-Id: I84355b49001c9a90a4450b224eabc117fa1606c2
2017-09-27Update java.util.Locale with Oreo release namePrzemyslaw Szczepaniak
am: 63552f3347 Change-Id: I6ee593198c90692e98242addc30b061bb99a3835
2017-09-27release-request-a41f1f54-b764-45d4-b9ce-16ae3001be88-for-git_oc-mr1-release- ↵android-build-team Robot
4362737 snap-temp-L87100000106492125 Change-Id: I6cd725215c93cc1232ea759ce8d614f233468c4a
2017-09-26Update java.util.Locale with Oreo release namePrzemyslaw Szczepaniak
Test: make docs Bug: 35863584 Change-Id: Ie2350b2b4f504d0372ccb4b93bb9bf2d0db2f247 (cherry picked from commit 36b1ba26083aa249ffc541c6d9d362d01ac3c9d1)
2017-09-26Merge "Expand SecurityManager javadoc with info about its support." into ↵Przemyslaw Szczepaniak
oc-dev am: ec9678e07c am: e2cab56e63 Change-Id: I857cc63d7271dec9bdccfeee1cd68f229c608233
2017-09-26Merge "Expand SecurityManager javadoc with info about its support." into oc-devPrzemyslaw Szczepaniak
am: ec9678e07c Change-Id: I57372cf3c310b937f6f555f880eecb1bf37e55d8
2017-09-26Merge "Expand SecurityManager javadoc with info about its support." into oc-devPrzemyslaw Szczepaniak
2017-09-22Merge "Clear DateFormat.is24Hour during test." into oreo-cts-dev am: ↵Joachim Sauer
41b45edffa am: 52d7517e1c am: b5763abf87 Change-Id: I45ed36ce887fb4aaf0e7d868bb0aa1139aa9fef2
2017-09-22Merge "Clear DateFormat.is24Hour during test." into oreo-cts-dev am: 41b45edffaJoachim Sauer
am: 52d7517e1c Change-Id: I4a591d5284b63280f9acc6f8cbdc2d06694b1545
2017-09-22Merge "Clear DateFormat.is24Hour during test." into oreo-cts-devJoachim Sauer
am: 41b45edffa Change-Id: I503a360ed08d6b0da7ccfb93d8b5e7a3b99bd9b0
2017-09-22Merge "Clear DateFormat.is24Hour during test." into oreo-cts-devTreehugger Robot
2017-09-19Clear DateFormat.is24Hour during test.Joachim Sauer
TCKLocalizedPrinterParser checks if java.time.format.DateTimeFormatter and java.text.DateFormat produce the same output for equivalent input. java.text.DateFormat takes into account DateFormat.is24Hour which represents a user-setting forcing a 12- or 24-hour clock. java.time intentionally doesn't respect that, which causes this test to fail when either a 12h or a 24h clock is forced. This commits clears the setting for the duration of the test and re-sets it to its orginal value afterwards. Test: cts --primary-abi-only -m CtsLibcoreOjTestCases Bug: 62651881 Change-Id: I30bab1d5f04cac8bdfc9a455c8ddc3ff39271077 (cherry picked from commit fd8f0567f4dee4faa29b23999d530545201b21e6)
2017-09-12release-request-ad401328-e365-4073-9b7c-44f7fc79185b-for-git_oc-mr1-release- ↵android-build-team Robot
4329935 snap-temp-L86100000101558881 Change-Id: I3a9b7edc164508301836fde5f5a1bb95008e0b99
2017-09-11Merge cherrypicks of [2879627, 2879649, 2879442, 2880524, 2879650] into ↵android-build-team Robot
oc-mr1-release Change-Id: I1cb8f415529a1c1244ef58b9d79773a940e2db0a
2017-09-11Rename argument from debugFlags to artFlags.Nicolas Geoffray
bug: 30972906 bug: 63920015 Test: device boots Change-Id: I236e1e96d09d5b999e3f8926f37fd58051449d49 (cherry picked from commit 9ee96da25efabda2d75da79354b2a37f08aae640)
2017-09-11Fix DatagramChannelMulticastTest.test_joinSourceSpecific_groupBind_ipv4 am: ↵Tobias Thierer
76c13bb7c7 am: 3bf8e9351d am: 4544a71c7a -s ours Change-Id: Iad1857a77ed21a06e0b827684ae30f2cdce0ee99
2017-09-11Fix DatagramChannelMulticastTest.test_joinSourceSpecific_groupBind_ipv4 am: ↵Tobias Thierer
76c13bb7c7 am: 3bf8e9351d Change-Id: Ic60c886dc40082ccd00fd7d29f7ef82c38f0655b
2017-09-11Fix DatagramChannelMulticastTest.test_joinSourceSpecific_groupBind_ipv4Tobias Thierer
am: 76c13bb7c7 Change-Id: Ic646c42aa34affd209caa4943c06cad1f131f139
2017-09-11Fix DatagramChannelMulticastTest.test_joinSourceSpecific_groupBind_ipv4Tobias Thierer
The test was passing the wrong NetworkInterface (IPv6 instead of IPv4) to a helper method; this would fail if that network interface didn't also support IPv4. Bug: 64825787 Test: DatagramChannelMulticastTest (cherry picked from commit 4aa761e49c9dcf534f8fc66389bd70323942aaf4) Change-Id: Ic934a03adc8e43dfdb3b50ba215933cf992fb58b Merged-In: Ic934a03adc8e43dfdb3b50ba215933cf992fb58b
2017-09-06Merge "Merge "Fix DatagramSocketTest#test_getRemoteSocketAddress" into ↵Victor Chang
nougat-cts-dev am: c2fc4acfdf" into nougat-mr1-cts-dev am: 40c8320b5f -s ours am: 42cbacbb97 am: 68289b968e am: 0ab1786104 Change-Id: Ic5591c975fec8368fc511ff86e8a6888f8508f15
2017-09-06Merge "Merge "Merge "Fix DatagramSocketTest#test_getRemoteSocketAddress" ↵Victor Chang
into nougat-cts-dev am: c2fc4acfdf" into nougat-mr1-cts-dev am: 40c8320b5f" into nyc-mr1-dev am: 8e539c7dcd am: d211bc2d61 am: d108cd6a28 am: 4a67228c8f am: d776b60105 Change-Id: I63d865baaa0e866681b1cf88df9e9de654bff6b5
2017-09-06Merge "Fix DatagramSocketTest#test_getRemoteSocketAddress" into ↵Victor Chang
nougat-cts-dev am: c2fc4acfdf am: 2b77305de4 am: ee4e3893f8 am: 1069d14b46 am: ced514dc2f am: 60e604b679 -s ours am: ced33ea831 am: aebd763250 Change-Id: Iaab68f1ffe4dea93393c41e92549a5b2ed2310dc
2017-09-06Merge "Merge "Fix DatagramSocketTest#test_getRemoteSocketAddress" into ↵Victor Chang
nougat-cts-dev am: c2fc4acfdf" into nougat-mr1-cts-dev am: 40c8320b5f -s ours am: 42cbacbb97 am: 68289b968e Change-Id: Ia4099992ce42eac4bf13e9086e1027e237acc051
2017-09-06Merge "Merge "Merge "Fix DatagramSocketTest#test_getRemoteSocketAddress" ↵Victor Chang
into nougat-cts-dev am: c2fc4acfdf" into nougat-mr1-cts-dev am: 40c8320b5f" into nyc-mr1-dev am: 8e539c7dcd am: d211bc2d61 am: d108cd6a28 am: 4a67228c8f Change-Id: I7acae726eaeea77f07a51210e05aea6db769a4fa
2017-09-06Merge "Merge "Fix DatagramSocketTest#test_getRemoteSocketAddress" into ↵Victor Chang
nougat-cts-dev am: c2fc4acfdf" into nougat-mr1-cts-dev am: 40c8320b5f -s ours am: 42cbacbb97 Change-Id: I458e937ca7b610da08dcfef3e5728857e1e74173
2017-09-06Merge "Fix DatagramSocketTest#test_getRemoteSocketAddress" into ↵Victor Chang
nougat-cts-dev am: c2fc4acfdf am: 2b77305de4 am: ee4e3893f8 am: 1069d14b46 am: ced514dc2f am: 60e604b679 -s ours am: ced33ea831 Change-Id: I696db0bbcbd9b88e1d176b7cf10bef257f39dffb
2017-09-06Merge "Merge "Merge "Fix DatagramSocketTest#test_getRemoteSocketAddress" ↵Victor Chang
into nougat-cts-dev am: c2fc4acfdf" into nougat-mr1-cts-dev am: 40c8320b5f" into nyc-mr1-dev am: 8e539c7dcd am: d211bc2d61 am: d108cd6a28 Change-Id: Id85a91394b93649dca049bf3d8ebf20c3be4ef3d
2017-09-06Merge "Merge "Fix DatagramSocketTest#test_getRemoteSocketAddress" into ↵Victor Chang
nougat-cts-dev am: c2fc4acfdf" into nougat-mr1-cts-dev am: 40c8320b5f -s ours Change-Id: I965d8532db6882060fb1ae835db1048b05f87420
2017-09-06Merge "Fix DatagramSocketTest#test_getRemoteSocketAddress" into ↵Victor Chang
nougat-cts-dev am: c2fc4acfdf am: 2b77305de4 am: ee4e3893f8 am: 1069d14b46 am: ced514dc2f am: 60e604b679 -s ours Change-Id: I2881ca253abfe2a648aa71130468971d62b169b4
2017-09-06Fix DatagramSocketTest#test_getRemoteSocketAddress am: 7e5fed0098 am: 612aa05c6eVictor Chang
am: 27dd43f3cb Change-Id: Ifcb027504113e04e9763605ee41ed8da31dbaf3e
2017-09-06Merge "Merge "Merge "Fix DatagramSocketTest#test_getRemoteSocketAddress" ↵Victor Chang
into nougat-cts-dev am: c2fc4acfdf" into nougat-mr1-cts-dev am: 40c8320b5f" into nyc-mr1-dev am: 8e539c7dcd am: d211bc2d61 Change-Id: I709d510c910f4aefb07a0e0a83de1f6252ac2e67
2017-09-06Merge "Fix DatagramSocketTest#test_getRemoteSocketAddress" into ↵Victor Chang
nougat-cts-dev am: c2fc4acfdf am: 2b77305de4 am: ee4e3893f8 am: 1069d14b46 am: ced514dc2f Change-Id: Ie4f2a04e61633ab2804ce04405cd9155b2b76d3e
2017-09-06Fix DatagramSocketTest#test_getRemoteSocketAddress am: 7e5fed0098Victor Chang
am: 612aa05c6e Change-Id: I34ca3594ed0ed6f2b06cdbc91fe44194b54de9fb
2017-09-06Merge "Merge "Merge "Fix DatagramSocketTest#test_getRemoteSocketAddress" ↵Victor Chang
into nougat-cts-dev am: c2fc4acfdf" into nougat-mr1-cts-dev am: 40c8320b5f" into nyc-mr1-dev am: 8e539c7dcd Change-Id: If9dae7b1544bc3c5cab77e4d7b0ca0b06e4f306a
2017-09-06Merge "Fix DatagramSocketTest#test_getRemoteSocketAddress" into ↵Victor Chang
nougat-cts-dev am: c2fc4acfdf am: 2b77305de4 am: ee4e3893f8 am: 1069d14b46 Change-Id: I2a686d3828d310014b98bdda01aedaad88118057