aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2021-02-08Snap for 7132927 from 09fd708abfd3812bda4511727caf02be0f10ce5c to mainline-os...android-mainline-11.0.0_r44android11-mainline-os-statsd-releaseandroid-build-team Robot
2021-02-03Ensure networkBio is closed in ConscryptEngine.Pete Bentley
2021-02-03Skip MetricsTest if StatsEvent unavailable. (#965)Pete Bentley
2021-02-01Split out MtsConscryptFdSocketTestCases.Pete Bentley
2021-01-14[RESTRICT AUTOMERGE] Merge fixes for Mainline.Pete Bentley
2021-01-14[RESTRICT AUTOMERGE] Fix NPE in OptionalMethod.Pete Bentley
2021-01-14[RESTRICT AUTOMERGE] Merge Conscrypt upstream master.Pete Bentley
2021-01-14[RESTRICT AUTOMERGE] Merge Conscrypt upstream master.Pete Bentley
2020-11-26Skip testing AES/GCM-SIV/NoPadding on BCPete Bentley
2020-08-19[automerger skipped] Add Unsupported App Usage annotations to ConscryptEngine...android-mainline-11.0.0_r35Pete Bentley
2020-08-19[automerger skipped] Add Unsupported App Usage annotations to ConscryptEngine...Pete Bentley
2020-08-10Add Unsupported App Usage annotations to ConscryptEngineSocket.android-cts-11.0_r2Pete Bentley
2020-07-23Add Unsupported App Usage annotations to ConscryptEngineSocket. am: 7b60118bcaPete Bentley
2020-07-23Add Unsupported App Usage annotations to ConscryptEngineSocket.Pete Bentley
2020-07-18Merge "Add native coverage flushing to ConscryptInstrumentationListener." int...TreeHugger Robot
2020-07-18Merge "Add native coverage flushing to ConscryptInstrumentationListener." int...android11-devTreeHugger Robot
2020-07-17Expose conscrypt-unbundled to apksig for PSS support am: 68c477b06cMichael Groover
2020-07-17Add native coverage flushing to ConscryptInstrumentationListener.Pete Bentley
2020-07-16Expose conscrypt-unbundled to apksig for PSS supportMichael Groover
2020-06-30Version bump to r_aml_309999900 [apex/apex_manifest.json]Akshay Thakker
2020-06-24Merge "Fix ConscryptEngineSocket.close()." into rvc-dev am: 8a635f3d8fTreeHugger Robot
2020-06-24Merge "Fix ConscryptEngineSocket.close()." into rvc-devTreeHugger Robot
2020-06-24Increase MtsConscryptTestCases timeout to 20 minutes, am: 5025de3847Pete Bentley
2020-06-24Fix ConscryptEngineSocket.close().Pete Bentley
2020-06-24Increase MtsConscryptTestCases timeout to 20 minutes,Pete Bentley
2020-06-22Merge Conscrypt upstream master. am: afbd77343fPete Bentley
2020-06-22Merge Conscrypt upstream master.Pete Bentley
2020-05-12Add lint-baseline.txt for core platform API am: 1a1998064ePaul Duffin
2020-05-11Add lint-baseline.txt for core platform APIPaul Duffin
2020-04-28Merge "Export java_sdk_library as a whole rather than individual parts" into ...TreeHugger Robot
2020-04-28Merge "Switch public api to use java_sdk_library" into rvc-devTreeHugger Robot
2020-04-28Merge "Rename conscrypt-module-public-api-stubs-source" into rvc-devPaul Duffin
2020-04-28Merge "Remove ART aggregation of conscrypt sources" into rvc-devPaul Duffin
2020-04-27Export java_sdk_library as a whole rather than individual partsPaul Duffin
2020-04-27Switch public api to use java_sdk_libraryPaul Duffin
2020-04-27Rename conscrypt-module-public-api-stubs-sourcePaul Duffin
2020-04-27Remove ART aggregation of conscrypt sourcesPaul Duffin
2020-04-27Exercise both Conscrypt implementations of SSLSocket.Pete Bentley
2020-04-27Merge "Rename AndroidTests.xml to AndroidTest.xml." into rvc-devTreeHugger Robot
2020-04-27Merge "Set min_sdk_version to be part of mainline modules" into rvc-devTreeHugger Robot
2020-04-27Merge "Add more coverage for OpenSSLRSAKeyFactory and OpenSSLECPrivateKey" in...TreeHugger Robot
2020-04-27Rename AndroidTests.xml to AndroidTest.xml.Pete Bentley
2020-04-27Set min_sdk_version to be part of mainline modulesJooyung Han
2020-04-24Add more coverage for OpenSSLRSAKeyFactory and OpenSSLECPrivateKeyDaulet Zhanguzin
2020-04-15Increase default timeout for Conscrypt tests to 10m (from default 5m).Daulet Zhanguzin
2020-04-08Merge upstream master.Pete Bentley
2020-04-08Merge Conscrypt upstream master.Pete Bentley
2020-04-06References libcore crypto testsDaulet Zhanguzin
2020-03-24Merge "Fix MtsConscryptTestCases crash" am: 7fed448c95 am: 1a59a228bc am: 77e...Treehugger Robot
2020-03-18Merge "Revert "Remove maxTargetSdk=Q restrioction on unsupported APIs."" into...Artur Satayev