aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-03-02merge in oc-release history after reset to masterandroid-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-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_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_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-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_r1security-oc-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-cts-releasegitbuildkicker
2017-03-01Merge "Add a -testdex variant for ART run-tests." am: 5edf30c23d am: 832e01a099android-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_r1oreo-vts-releaseoreo-devoreo-cts-devNicolas Geoffray
am: 2baece252f Change-Id: I4e8dd05272e1bcef6032c89f022856ad70ed36e9
2017-03-01Merge "Add a -testdex variant for ART run-tests." am: 5edf30c23dNicolas Geoffray
am: 832e01a099 Change-Id: If1f7eeb23b38f6556a200a460401f17d7c275907
2017-03-01Merge "Add a -testdex variant for ART run-tests."Nicolas Geoffray
am: 5edf30c23d Change-Id: I74a9fecf5f9d9a2a21558738248dc41a38deab5a
2017-03-01Merge "Add a -testdex variant for ART run-tests."android-o-preview-1android-n-mr2-preview-2o-previewNicolas Geoffray
2017-03-01Add a -testdex variant for ART run-tests.Nicolas Geoffray
bug:24535627 Change-Id: Ia26810f1f79f573161c0ca0b80a1dcabc883aec8
2017-02-18Merge "Mark nougat-mr1-cts-dev revision ↵Xin Li
2aa19448cfc0dbd159e1f7dcad3e622ac08eb1d0 in master as merged." am: 95880e5eb1 am: e7a565e361 am: df2c3e714d Change-Id: I922110d7a2e97326e6d40702113b79b4b3ced6a3
2017-02-18Merge "Mark nougat-mr1-cts-dev revision ↵Xin Li
2aa19448cfc0dbd159e1f7dcad3e622ac08eb1d0 in master as merged." am: 95880e5eb1 am: e7a565e361 Change-Id: If9cdd4becb3b13bb7f8a0a1a21243b0ffa7f8e75
2017-02-18Merge "Mark nougat-mr1-cts-dev revision ↵Xin Li
2aa19448cfc0dbd159e1f7dcad3e622ac08eb1d0 in master as merged." am: 95880e5eb1 Change-Id: I7aceaae900e7b8d624986a7a1a126603f0b7c41e
2017-02-18Merge "Mark nougat-mr1-cts-dev revision ↵Treehugger Robot
2aa19448cfc0dbd159e1f7dcad3e622ac08eb1d0 in master as merged."
2017-02-17Mark nougat-mr1-cts-dev revision 2aa19448cfc0dbd159e1f7dcad3e622ac08eb1d0Xin Li
in master as merged. BUG: 35224217 Change-Id: I9e08e97a686478f8f65f2ecbca59aa1244ac120f
2017-01-25OkHttp quick fix: canceled StreamAllocations can never recoverTobias Thierer
When a HttpURLConnection is disconnected in the middle of connecting, this can lead to an infinite loop because: - StreamAllocation.findConnection() immediately throws (before advancing the RouteSelector) - StreamAllocation.recover() returns true, indicating that a retry is permissible - higher level logic then retries the connection indefinitely in a busy loop This bug does not occur in the latest version of OkHttp (3.5) but can be reproduced directly on top of OkHttp 2.7.5. To give us more time to figure out the best fix, this CL makes the narrowest possible fix for the concrete behavior observed in the wild. There are related cases where StreamAllocation.recover() returns true but findConnection() immediately throws; these have not been observed and are not addressed by this CL: - StreamAllocation.released; this case looks at first glance like it is not reachable via publicly exposed API (HttpURLConnection) - canceled case for recover(IOException e, Sink requestBodyOut): touching this breaks OkHttp's CallTest.canceledBeforeIOSignalsOnFailure*() because the reported error message becomes something like "Socket closed", rather than reviewed "Canceled". Test: CtsLibcoreTestCases Test: CtsLibcoreOkHttpTestCases Bug: 33763156 Change-Id: Ie8e80559f9364cbd0a01c54b441fc10402b37862 (cherry picked from commit 715f88092afc34bbe129118fa9ed737ad38ec050)
2017-01-25Merge "OkHttp quick fix: canceled StreamAllocations can never recover" am: ↵Tobias Thierer
390c78c5cd am: 66ef890399 am: 3e1f83e9f5 am: 0b809cf8b1 Change-Id: Ib9516599c31ecce369ef10470cd14f672310937b
2017-01-25Merge "OkHttp quick fix: canceled StreamAllocations can never recover" am: ↵Tobias Thierer
390c78c5cd am: 66ef890399 am: 3e1f83e9f5 Change-Id: I68937ee2cbfcc58a5569af40ed171ffd7065f4da
2017-01-25Merge "OkHttp quick fix: canceled StreamAllocations can never recover" am: ↵Tobias Thierer
390c78c5cd am: 66ef890399 Change-Id: I32e1850f51651f5ed18c7c52e0ef267eab9dbf96
2017-01-25Merge "OkHttp quick fix: canceled StreamAllocations can never recover"Tobias Thierer
am: 390c78c5cd Change-Id: I48700dcc38ca41d857d982c913b32d9920e92ebf
2017-01-25Merge "OkHttp quick fix: canceled StreamAllocations can never recover"Tobias Thierer
2017-01-24OkHttp quick fix: canceled StreamAllocations can never recoverTobias Thierer
When a HttpURLConnection is disconnected in the middle of connecting, this can lead to an infinite loop because: - StreamAllocation.findConnection() immediately throws (before advancing the RouteSelector) - StreamAllocation.recover() returns true, indicating that a retry is permissible - higher level logic then retries the connection indefinitely in a busy loop This bug does not occur in the latest version of OkHttp (3.5) but can be reproduced directly on top of OkHttp 2.7.5. To give us more time to figure out the best fix, this CL makes the narrowest possible fix for the concrete behavior observed in the wild. There are related cases where StreamAllocation.recover() returns true but findConnection() immediately throws; these have not been observed and are not addressed by this CL: - StreamAllocation.released; this case looks at first glance like it is not reachable via publicly exposed API (HttpURLConnection) - canceled case for recover(IOException e, Sink requestBodyOut): touching this breaks OkHttp's CallTest.canceledBeforeIOSignalsOnFailure*() because the reported error message becomes something like "Socket closed", rather than reviewed "Canceled". Test: CtsLibcoreTestCases Test: CtsLibcoreOkHttpTestCases Bug: 33763156 Change-Id: Ie8e80559f9364cbd0a01c54b441fc10402b37862
2017-01-13Merge "Skip commit '92bbc8ec30776858db942383b7ade6c0aeeaaa65' in ↵Xin Li
nougat-mr1-cts-dev as the commit was marked as DO NOT MERGE." into nougat-mr1-cts-dev am: 2aa19448cf -s ours am: bb26711fdd am: 6aa0b0565f am: 5515db3267 am: ef494fa4ca -s ours Change-Id: I1de5158ad066af70dffa8c1b40404d5cad31ccb9
2017-01-13Skip commit '92bbc8ec30776858db942383b7ade6c0aeeaaa65' in nougat-mr1-cts-dev ↵Xin Li
as the commit was marked as DO NOT MERGE. am: cfb32c0926 -s ours am: 72bd84cc18 am: f27b53025b am: 8b8772451b am: c8ca5c0d22 -s ours Change-Id: Icb5f1c6c36ab2c160532a33c5e67d1248240354c
2017-01-13Merge "Skip commit '92bbc8ec30776858db942383b7ade6c0aeeaaa65' in ↵Xin Li
nougat-mr1-cts-dev as the commit was marked as DO NOT MERGE." into nougat-mr1-cts-dev am: 2aa19448cf -s ours am: bb26711fdd am: 6aa0b0565f am: 5515db3267 Change-Id: I57eabb8a39546703c91e6f3fcb29cc770500c699
2017-01-13Skip commit '92bbc8ec30776858db942383b7ade6c0aeeaaa65' in nougat-mr1-cts-dev ↵Xin Li
as the commit was marked as DO NOT MERGE. am: cfb32c0926 -s ours am: 72bd84cc18 am: f27b53025b am: 8b8772451b Change-Id: I30eb8808b98362075ba6486f36d5c273ad9ca636
2017-01-13Merge "Skip commit '92bbc8ec30776858db942383b7ade6c0aeeaaa65' in ↵Xin Li
nougat-mr1-cts-dev as the commit was marked as DO NOT MERGE." into nougat-mr1-cts-dev am: 2aa19448cf -s ours am: bb26711fdd am: 6aa0b0565f am: d5de980a7a am: 5dea99327a -s ours Change-Id: I45679791cc4cf428a8e3c4ae4238b5bfc5f25c4e
2017-01-13Skip commit '92bbc8ec30776858db942383b7ade6c0aeeaaa65' in nougat-mr1-cts-dev ↵Xin Li
as the commit was marked as DO NOT MERGE. am: cfb32c0926 -s ours am: 72bd84cc18 am: f27b53025b am: 43c9408dc0 am: 82f5a30c74 -s ours Change-Id: I090d1b4eb9d22af9c44abd223ca6b5e80bfecf00
2017-01-13Merge "Skip commit '92bbc8ec30776858db942383b7ade6c0aeeaaa65' in ↵Xin Li
nougat-mr1-cts-dev as the commit was marked as DO NOT MERGE." into nougat-mr1-cts-dev am: 2aa19448cf -s ours am: bb26711fdd am: 6aa0b0565f am: d5de980a7a Change-Id: I7df0b7970686333242c584539969278ddadc51e2
2017-01-13Skip commit '92bbc8ec30776858db942383b7ade6c0aeeaaa65' in nougat-mr1-cts-dev ↵Xin Li
as the commit was marked as DO NOT MERGE. am: cfb32c0926 -s ours am: 72bd84cc18 am: f27b53025b am: 43c9408dc0 Change-Id: I48760821dea7077052a802dc495f99b17e8c24af
2017-01-13Merge "Skip commit '92bbc8ec30776858db942383b7ade6c0aeeaaa65' in ↵Xin Li
nougat-mr1-cts-dev as the commit was marked as DO NOT MERGE." into nougat-mr1-cts-dev am: 2aa19448cf -s ours am: bb26711fdd am: 6aa0b0565f Change-Id: I0c844fcddc94397683cd8e513c9bbcfcbd5aee07
2017-01-13Merge "Skip commit '92bbc8ec30776858db942383b7ade6c0aeeaaa65' in ↵nougat-mr2-devXin Li
nougat-mr1-cts-dev as the commit was marked as DO NOT MERGE." into nougat-mr1-cts-dev am: 2aa19448cf -s ours am: bb26711fdd am: 6aa0b0565f Change-Id: Ie424175ac5296feb654ac7e17620249e41411bf7
2017-01-13Skip commit '92bbc8ec30776858db942383b7ade6c0aeeaaa65' in nougat-mr1-cts-dev ↵Xin Li
as the commit was marked as DO NOT MERGE. am: cfb32c0926 -s ours am: 72bd84cc18 am: f27b53025b Change-Id: I0dde0ee1a9a93a78e4c76521c6a5c2bc2b686e99
2017-01-13Skip commit '92bbc8ec30776858db942383b7ade6c0aeeaaa65' in nougat-mr1-cts-dev ↵Xin Li
as the commit was marked as DO NOT MERGE. am: cfb32c0926 -s ours am: 72bd84cc18 am: f27b53025b Change-Id: I14a54dedd69969c8929dcbca0ccff0ebae4d7c01
2017-01-13Merge "Skip commit '92bbc8ec30776858db942383b7ade6c0aeeaaa65' in ↵Xin Li
nougat-mr1-cts-dev as the commit was marked as DO NOT MERGE." into nougat-mr1-cts-dev am: 2aa19448cf -s ours am: bb26711fdd Change-Id: Icef427c7bca9c030a987d46b4857710f4f353bd2
2017-01-13Skip commit '92bbc8ec30776858db942383b7ade6c0aeeaaa65' in nougat-mr1-cts-dev ↵Xin Li
as the commit was marked as DO NOT MERGE. am: cfb32c0926 -s ours am: 72bd84cc18 Change-Id: Ie4a89660150f29649ae21928df3364c05c8ca269
2017-01-13Merge "Skip commit '92bbc8ec30776858db942383b7ade6c0aeeaaa65' in ↵Xin Li
nougat-mr1-cts-dev as the commit was marked as DO NOT MERGE." into nougat-mr1-cts-dev am: 2aa19448cf -s ours Change-Id: I5b1e81a7048ca8567a91fbe459e22dbed6b74865
2017-01-13Skip commit '92bbc8ec30776858db942383b7ade6c0aeeaaa65' in nougat-mr1-cts-dev ↵Xin Li
as the commit was marked as DO NOT MERGE. am: cfb32c0926 -s ours Change-Id: Ie39eb42ba4241ceff3cf97ca30e86e0e57fd3dfc
2017-01-13Merge "Skip commit '92bbc8ec30776858db942383b7ade6c0aeeaaa65' in ↵android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10nougat-mr1-cts-releasenougat-mr1-cts-devTreehugger Robot
nougat-mr1-cts-dev as the commit was marked as DO NOT MERGE." into nougat-mr1-cts-dev
2017-01-12Skip commit '92bbc8ec30776858db942383b7ade6c0aeeaaa65' in nougat-mr1-cts-devXin Li
as the commit was marked as DO NOT MERGE. BUG: 33090058 Change-Id: I52267eaa84eafa0905482a92aaf19717501cddef
2016-12-07Merge "Replace junit4-target with junit" am: 0663ccec7f am: a22b7fe69a am: ↵Paul Duffin
480165aee0 am: 547297e0f7 Change-Id: I5ddacf5995a24724356707f2b8cf5cf45ed0abb5
2016-12-07Merge "Replace junit4-target with junit" am: 0663ccec7f am: a22b7fe69aPaul Duffin
am: 480165aee0 Change-Id: Idc2112e978581372a3f1c75ffdd4a7bc8926d52f
2016-12-07Merge "Replace junit4-target with junit" am: 0663ccec7fPaul Duffin
am: a22b7fe69a Change-Id: I2ea949b5de8b2a2491851a4c951d3220a13228f0
2016-12-07Merge "Replace junit4-target with junit"Paul Duffin
am: 0663ccec7f Change-Id: I9ec7026817b47bb258dd13f9274d893dfeaf1e62
2016-12-07Merge "Replace junit4-target with junit"android-n-mr2-preview-1Paul Duffin
2016-12-07Replace junit4-target with junitPaul Duffin
Bug: 30188076 Test: make checkbuild Change-Id: I726c2f80581b2ad5adecc13c3fff81d7f006077a
2016-11-23Merge "DO NOT MERGE Relax N CTS about whether \t is allowed in header ↵Tina Zhou
values" into nougat-cts-dev am: 92bbc8ec30 -s ours am: 7682043b2a am: 1e86b5a581 am: 182c873a7a am: 5c857a60c5 am: 68f1eabd5a am: 313cc2e4b6 -s ours Change-Id: I00abcd6faf9c602ceebbdd5ac41e35783ccda309
2016-11-23DO NOT MERGE Relax N CTS about whether \t is allowed in header values am: ↵Tobias Thierer
b0026778a4 -s ours am: 54446be3a6 am: 58bb4fe19a am: a148055d19 am: 242c35912b am: 9c64f85401 am: 1f52d62108 -s ours Change-Id: Id877edc26455e28b23add142935981d6ebd98ea0
2016-11-23Merge "DO NOT MERGE Relax N CTS about whether \t is allowed in header ↵Tina Zhou
values" into nougat-cts-dev am: 92bbc8ec30 -s ours am: 7682043b2a am: 1e86b5a581 am: 182c873a7a am: 5c857a60c5 am: 68f1eabd5a Change-Id: I39ffcb9eb537299bf293f6abcb37e483da7c9dd6
2016-11-23DO NOT MERGE Relax N CTS about whether \t is allowed in header values am: ↵Tobias Thierer
b0026778a4 -s ours am: 54446be3a6 am: 58bb4fe19a am: a148055d19 am: 242c35912b am: 9c64f85401 Change-Id: I4473eb2d3db1dad975bbd1fae3793150ca5afcdb
2016-11-23Merge "DO NOT MERGE Relax N CTS about whether \t is allowed in header ↵Tina Zhou
values" into nougat-cts-dev am: 92bbc8ec30 -s ours am: 7682043b2a am: 1e86b5a581 am: 182c873a7a am: 5c857a60c5 Change-Id: Ib8f2abcbc608667728f2dbb5e353e52c69090722
2016-11-23DO NOT MERGE Relax N CTS about whether \t is allowed in header values am: ↵Tobias Thierer
b0026778a4 -s ours am: 54446be3a6 am: 58bb4fe19a am: a148055d19 am: 242c35912b Change-Id: I0f661347b37436db2f3b81141158fdcb22946e74
2016-11-17Merge "DO NOT MERGE Relax N CTS about whether \t is allowed in header ↵Tina Zhou
values" into nougat-cts-dev am: 92bbc8ec30 -s ours am: 7682043b2a am: 1e86b5a581 am: 182c873a7a am: 5c857a60c5 am: b3efabc628 am: b0d0b0a39f -s ours Change-Id: Ib8ade3de046fc8e6bd7a84e38d748235d9d43158
2016-11-17DO NOT MERGE Relax N CTS about whether \t is allowed in header values am: ↵Tobias Thierer
b0026778a4 -s ours am: 54446be3a6 am: 58bb4fe19a am: a148055d19 am: 242c35912b am: c350923a85 am: 3705d23071 -s ours Change-Id: I8487911d5a53157ef67e793b017fe65fb9c9ca91
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 12:42:14 +0000