aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Make okhttp-nojarjar visible to art sdk" am: 781dda91ba am: ↵android-mainline-11.0.0_r1android11-tests-releaseandroid11-tests-devandroid11-mainline-releaseandroid11-devAutomerger Merge Worker2020-01-191-0/+1
|\ | | | | | | | | | | 7ade36b9f2 am: 1f06e3d01e Change-Id: I5bab637927aefc934c5d17dd2b89b6b68aaa900a
| * Merge "Make okhttp-nojarjar visible to art sdk" am: 781dda91ba am: 7ade36b9f2Automerger Merge Worker2020-01-191-0/+1
| |\ | | | | | | | | | Change-Id: Ib3eb273df9be05c15a48bcba1f4fdfa4f109cfe2
| | * Merge "Make okhttp-nojarjar visible to art sdk"android-r-preview-4android-r-preview-3android-r-preview-2Paul Duffin2020-01-191-0/+1
| |/| | | | | | | | | | | | | | | | am: 781dda91ba Change-Id: I31ca7a29a9ad789d045c8440caf77a0c7ac29460
| | * Merge "Make okhttp-nojarjar visible to art sdk"android-r-preview-1Treehugger Robot2020-01-191-0/+1
| | |\
| | | * Make okhttp-nojarjar visible to art sdkPaul Duffin2020-01-171-0/+1
| | |/ | | | | | | | | | | | | | | | Bug: 142935992 Test: m art-module-sdk art-module-host-exports art-module-test-exports Change-Id: I31ed53048c3a35c919d8765842f17d711e5daa8d
* | | Merge "Set apex_available for okhttp" am: 518242f5e6 am: ecf245153bAnton Hansson2020-01-101-0/+4
|\| | | | | | | | | | | | | | | | | am: 6ca2471f54 Change-Id: I6604552269e97db52313c2bd0d60d1ba15d583f2
| * | Merge "Set apex_available for okhttp" am: 518242f5e6 am: ecf245153bAutomerger Merge Worker2020-01-101-0/+4
| |\ \ | | | | | | | | | | | | Change-Id: Iad7cdeeb1e10d27e7f24f0c663121b7a1b96901b
| | * | Merge "Set apex_available for okhttp"Anton Hansson2020-01-101-0/+4
| | |\| | | | | | | | | | | | | | | | | | | | | am: 518242f5e6 Change-Id: I400ac0b29be1b8f4d8557e1c0b035a9be53e5022
| | | * Merge "Set apex_available for okhttp"Anton Hansson2020-01-101-0/+4
| | | |\
| | | | * Set apex_available for okhttpAnton Hansson2020-01-101-0/+4
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are making apex_available required to be set to put modules into an apex. Bug: 147364041 Test: m Change-Id: I74dbd9a2b2a4bfb8b02252abec5cda649b80e43c
* | | | Merge "Create strict instances of OKHostnameVerifier on demand." am: ↵Automerger Merge Worker2020-01-093-9/+15
|\| | | | | | | | | | | | | | | | | | | | | | | 0853842321 am: ebe0c0da24 am: cb693b22f9 Change-Id: Ia096dfaf8e252d540889c41886062f363ed2f7ce
| * | | Merge "Create strict instances of OKHostnameVerifier on demand." am: ↵Automerger Merge Worker2020-01-093-9/+15
| |\| | | | | | | | | | | | | | | | | | | | | | 0853842321 am: ebe0c0da24 Change-Id: I7c54b2f6ea8619390b7f0ee6b190a67bedf775fd
| | * | Merge "Create strict instances of OKHostnameVerifier on demand."Pete Bentley2020-01-093-9/+15
| | |\| | | | | | | | | | | | | | | | | | | | | am: 0853842321 Change-Id: Iae28c407a67bf07962db7276fa1dab2e2d1a946b
| | | * Merge "Create strict instances of OKHostnameVerifier on demand."Pete Bentley2020-01-093-9/+15
| | | |\
| | | | * Create strict instances of OKHostnameVerifier on demand.Pete Bentley2020-01-073-9/+15
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most users are never going to need this so don't pre-create an instance. Bug: 144694112 Test: atest CtsLibcoreOkHttpTestCases:com.squareup.okhttp.internal.tls.HostnameVerifierTest Test: atest CtsLibcoreTestCases:org.apache.harmony.tests.javax.net.ssl.HostnameVerifierTest Change-Id: Ie872ac222fc2d1b9f1e4da6bee25f3d4d5a0d722
* | | | Merge "Use new UnsupportedAppUsage annotation." am: 0db3af9fb3 am: ↵Automerger Merge Worker2019-12-1121-77/+85
|\| | | | | | | | | | | | | | | | | | | | | | | d45c94d001 am: 18ea0e1f4f Change-Id: I24a0850ed8eebba03472497ad2919f3d64d18a4f
| * | | Merge "Use new UnsupportedAppUsage annotation." am: 0db3af9fb3 am: d45c94d001Automerger Merge Worker2019-12-1121-77/+85
| |\| | | | | | | | | | | | | | Change-Id: Ic6e2863b20c89080ef9999e1a537f164501041d1
| | * | Merge "Use new UnsupportedAppUsage annotation."Artur Satayev2019-12-1121-77/+85
| | |\| | | | | | | | | | | | | | | | | | | | | am: 0db3af9fb3 Change-Id: Ic7224c2dea99901b22709fcabc3b6ef7e6e9c8b0
| | | * Merge "Use new UnsupportedAppUsage annotation."Treehugger Robot2019-12-1121-77/+85
| | |/|
| | | * Use new UnsupportedAppUsage annotation.Artur Satayev2019-12-1021-77/+85
| | |/ | | | | | | | | | | | | | | | | | | | | | Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library. Bug: 145132366 Test: m && diff unsupportedappusage_index.csv Change-Id: Idc7847791a00212dd8608798cc69ab6c7fa08294
* | | Merge "Add strict mode to OkHostnameVerifier for top-level domain ↵Pete Bentley2019-11-273-5/+100
|\| | | | | | | | | | | | | | | | | | | | | | | wildcards." am: 5def0741cb am: d2ac336108 am: 89bee31f95 Change-Id: I06ad4d8e0020f04d189d94bd0bcc7e12017944eb
| * | Merge "Add strict mode to OkHostnameVerifier for top-level domain ↵Pete Bentley2019-11-273-5/+100
| |\| | | | | | | | | | | | | | | | | | | | | | wildcards." am: 5def0741cb am: d2ac336108 Change-Id: I779ab77861a840ab5e7870f5e09a5e781762d894
| | * Merge "Add strict mode to OkHostnameVerifier for top-level domain wildcards."Pete Bentley2019-11-273-5/+100
| | |\ | | | | | | | | | | | | | | | | | | | | am: 5def0741cb Change-Id: I4a1ebfcb4858ad84f47e2615d73c9dc8cf822b6c
| | | * Merge "Add strict mode to OkHostnameVerifier for top-level domain wildcards."Pete Bentley2019-11-273-5/+100
| | | |\
| | | | * Add strict mode to OkHostnameVerifier for top-level domain wildcards.Pete Bentley2019-11-273-5/+100
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When enabled, Subject Alternative Names in certificates will be rejected if they have wildcards for top-level domains, such as "*.com". Strict mode is off for the instance of OkHostnameVerifier returned by HttpsURLConnection.getDefaultHostnameVerifier(), so this CL should have no visible behaviour change. Bug: 144694112 Test: atest CtsLibcoreTestCases CtsLibcoreOkHttpTestCases Change-Id: I9fd28995441d462d9106703f06762549591797ad
* | | | [automerger skipped] DO NOT MERGE - ↵Xin Li2019-10-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 5c1feaf419 am: 937ad27e18 -s ours am skip reason: subject contains skip directive Change-Id: I50a3e89b430c702a8a85e8f4c8d3f823dd6b26db
| * | | DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li2019-10-300-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: 5c1feaf419 Change-Id: I7e61b5f6e8cd8844d3346dcd97cf728f9e6ee0c4
| | * | DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li2019-10-300-0/+0
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | stage-aosp-master Bug: 142003500 Change-Id: I488087889f555630c8e95094b5d0ac58a94a017d
* | | | Merge "Switch from conscrypt to conscrypt intra core api" am: 5bff2652cf am: ↵Paul Duffin2019-10-051-7/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 39cedfa4c0 am: bf1273c7b2 am: 27d081d8a8 Change-Id: I65d88436a84d35cc98b3e63427d91363c72bdeac
| * | | Merge "Switch from conscrypt to conscrypt intra core api" am: 5bff2652cf am: ↵Paul Duffin2019-10-051-7/+4
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 39cedfa4c0 am: bf1273c7b2 Change-Id: I74cf5d1182100b805718dafe1959d8ae565deba6
| | * | Merge "Switch from conscrypt to conscrypt intra core api" am: 5bff2652cfPaul Duffin2019-10-051-7/+4
| | |\| | | | | | | | | | | | | | | | | | | | | am: 39cedfa4c0 Change-Id: I1f7b12e20212834d668ffbfdc69e4c173f9d3c35
| | | * Merge "Switch from conscrypt to conscrypt intra core api"Paul Duffin2019-10-051-7/+4
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | am: 5bff2652cf Change-Id: Ibb0438f3b3c001070a737ddf3cf11bfc5d968dab
| | | | * Merge "Switch from conscrypt to conscrypt intra core api"ndk-sysroot-r21Paul Duffin2019-10-051-7/+4
| | | | |\
| | | | | * Switch from conscrypt to conscrypt intra core apiPaul Duffin2019-10-021-7/+4
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 129126571 Test: m checkbuild Change-Id: I2cff35894fbe80f8cf37aa528d9b5eea953c5586
* | | | | Merge "Remove duplicate libraries that are provided by system modules" am: ↵Paul Duffin2019-09-231-8/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c56d705036 am: f109c3fc83 am: 76b0c375da am: b824fb433d Change-Id: I96afb6c69fdaa3685f142e8863a3364d4ca9de8b
| * | | | Merge "Remove duplicate libraries that are provided by system modules" am: ↵Paul Duffin2019-09-231-8/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c56d705036 am: f109c3fc83 am: 76b0c375da Change-Id: I9f85742b2dc6b2a9a3a33e4cfbd659778d356043
| | * | | Merge "Remove duplicate libraries that are provided by system modules" am: ↵Paul Duffin2019-09-231-8/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c56d705036 am: f109c3fc83 Change-Id: I66c171063994d2a84bed2755d3c078f2330c7d88
| | | * | Merge "Remove duplicate libraries that are provided by system modules"Paul Duffin2019-09-231-8/+4
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | am: c56d705036 Change-Id: I0bb7704b91a949763e01437b0416492f33f6acc4
| | | | * Merge "Remove duplicate libraries that are provided by system modules"Treehugger Robot2019-09-231-8/+4
| | | | |\
| | | | | * Remove duplicate libraries that are provided by system modulesPaul Duffin2019-09-201-8/+4
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An improvement in the Soong build means that it is no longer necessary to duplicate the libraries that it provides. This change removes the duplicates and moves the system_modules property next to sdk_version property to be consistent and because those properties are tightly coupled. Bug: 141359858 Test: m checkbuild Change-Id: I205928f6c1f42d5948e1b89f0e81081a84779c81
* | | | | Merge "Add TEST_MAPPINGS for external/okhttp." am: d650f3b3aa am: 0c15df6b70 ↵Pete Gillin2019-09-1613-0/+126
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 317d686d5d am: a327fb3dec Change-Id: I441843950787eaa69bab2e80c5117602b693630c
| * | | | Merge "Add TEST_MAPPINGS for external/okhttp." am: d650f3b3aa am: 0c15df6b70Pete Gillin2019-09-1613-0/+126
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 317d686d5d Change-Id: I14ab6ae104ff89a636d02d0d7d9bb61de5261542
| | * | | Merge "Add TEST_MAPPINGS for external/okhttp." am: d650f3b3aaPete Gillin2019-09-1613-0/+126
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0c15df6b70 Change-Id: I92ecec4b977c8876c6cc151c92fff9a9116409d7
| | | * | Merge "Add TEST_MAPPINGS for external/okhttp."Pete Gillin2019-09-1613-0/+126
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | am: d650f3b3aa Change-Id: I192dcf916e82c3bcd8b64f4a5b0b47d992401c9a
| | | | * Merge "Add TEST_MAPPINGS for external/okhttp."Pete Gillin2019-09-1613-0/+126
| | | | |\
| | | | | * Add TEST_MAPPINGS for external/okhttp.Pete Gillin2019-09-0413-0/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are simple package-to-package mappings. Test: treehugger Bug: 130283485 Change-Id: I3320d2adfee520910009249f8ed00861641c90e3
* | | | | | [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li2019-09-080-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: c7c312058a -s ours am: 3d2e73b7c5 -s ours am: fcb9966dbd -s ours am skip reason: change_id I2d549978ac740680824b129af68e39648c832dd5 with SHA1 1c3bb58fb6 is in history Change-Id: I1987d98b65a7cb299a7e35af52b5bc0228d58e4e
| * | | | | [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li2019-09-080-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: c7c312058a -s ours am: 3d2e73b7c5 -s ours am skip reason: change_id I2d549978ac740680824b129af68e39648c832dd5 with SHA1 1c3bb58fb6 is in history Change-Id: Ib621327e627a0b22501b52c2aa07d0dd29743e28
| | * | | | [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li2019-09-080-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: c7c312058a -s ours am skip reason: change_id I2d549978ac740680824b129af68e39648c832dd5 with SHA1 1c3bb58fb6 is in history Change-Id: Ie83875b7f7dd5dd2df1c52b0a21282dead18ac60
| | | * | | Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li2019-09-080-0/+0
| | | |\ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No content change. Bug: 135460123 Change-Id: Ia5ccf9cf8d88cf45d9742bb8dff38174dd1d3daa Merged-In: I2d549978ac740680824b129af68e39648c832dd5
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-02 22:36:58 +0000