summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-12-04Snap for 11174750 from 3ef3364df013eb7d96cc95318a880bd1035d8e25 to ↵aml_ext_341414010android14-mainline-extservices-releaseAndroid Build Coastguard Worker
mainline-extservices-release Change-Id: I588bd9b1b871891aae69bef438afe6cf9b94f77e
2023-11-30Finalize artifacts for extension SDK 11Gurpreet Singh
Import from build id 11162045. Generated with: $ packages/modules/common/tools/finalize_sdk.py -f 11 -b 314132157 -r 'Finalized in November 2023 between U and V (adservices, tethering)' -m com.google.android.adservices -m com.google.android.tethering 11162045 Bug: 314132157 Test: presubmit Change-Id: I370c4b0857c2a3155d221b5741668fd69f7a29e5
2023-11-29Add missing method overrides to previously released APIPaul Duffin
Applies corrections that were applied to the current API files to the previously released API files to avoid those additional methods being incorrectly treated as new methods when they did exist in previous versions. This applies the corrections that were added to the current API files in: * https://r.android.com/2700373 Test: m checkapi Bug: 299366704 Change-Id: I3d7abf2d6d8b51e98321f46d584b398fa609898c
2023-11-29Add missing method overrides to previously released APIPaul Duffin
Applies corrections that were applied to the current API files to the previously released API files to avoid those additional methods being incorrectly treated as new methods when they did exist in previous versions. This applies the corrections that were added to the current API files in: * https://r.android.com/2824410 Test: m checkapi Bug: 299366704 Change-Id: Ibc65062b372bbb90ddbba40abb0667a4f14d8c14
2023-11-24Merge changes from topic "ump-metalava-merge-nov-22" into udc-mainline-prodPaul Duffin
* changes: Add missing method overrides to previously released API Add missing method overrides to previously released API
2023-11-23Add missing method overrides to previously released APIPaul Duffin
The accompanying change in the topic adds some missing concrete overrides of abstract methods to the current API signature files. This change does the same for the corresponding previously released API files to avoid those additional methods being incorrectly treated as new methods when they did exist in previous versions. Test: m checkapi Bug: 299366704 Change-Id: Ifbbf9a0b90025aea5156dadc3ba12d41dabeb3e9
2023-11-23Add missing method overrides to previously released APIPaul Duffin
Applies corrections that were applied to the current API files to the previously released API files to avoid those additional methods being incorrectly treated as new methods when they did exist in previous versions. This applies the corrections that were added to the current API files in: * http://ag/25462854 Test: m checkapi Bug: 299366704 Merged-In: I3b8b68d97acd7cbadbf278f4eab9ec5ed28792a4 Merged-In: I514a727205204df178d3553ac80483248eee658c Merged-In: I3f36f53624662c346a1d2f0ae94320af627c8d17 Merged-In: I178c73a209454392a65307f109265db9557f15b2 Merged-In: I9430122992ee55f29c9b1f7d4de44052e89c0e03 Change-Id: Ibc3a5b2fc780afa44f4aa3bed8c7070240d1a6dd
2023-11-21Update AndroidX from build 11128528natnaelbelay
Arguments: --include androidx.navigation:navigation-testing --build 11128528 --upstream goog/udc-mainline-prod Test: prebuilts Change-Id: Iab2e605c2489a9cb2c41b0bb16bf7dbde3c66933
2023-11-15Update AndroidX from build 11006166natnaelbelay
Arguments: --upstream goog/udc-mainline-prod --include androidx.javascriptengine --build 11006166 Test: prebuilts Merged-In: I13ed851a4d13371d72b34db436c12263ef32cf2b Change-Id: I44bca7a84ff8163a11b025b6d64aacc3b4c64ba0
2023-11-14Merge "Update AndroidX from existing prebuilts" into udc-mainline-prodTreehugger Robot
2023-11-10Add missing method overrides to previously released APIPaul Duffin
The accompanying change in the topic adds some missing concrete overrides of abstract methods to the current API signature files. This change does the same for the corresponding previously released API files to avoid those additional methods being incorrectly treated as new methods when they did exist in previous versions. Test: m checkapi Bug: 299366704 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:58b9adc11ff03225b9df98c482e125374d37afe5) Merged-In: If78491a61ada613271d2d9d40c60c5c9f8c031ce Change-Id: If78491a61ada613271d2d9d40c60c5c9f8c031ce
2023-11-09Merge cherrypicks of ['googleplex-android-review.googlesource.com/25033708'] ↵aml_ext_341317010Android Build Coastguard Worker
into mainline-extservices-release. Change-Id: Ic7d1c0f2e09fdf83ed134ed22d855dbeddbd4a3a
2023-11-09Add missing method overrides to previously released APIPaul Duffin
The accompanying change in the topic adds some missing concrete overrides of abstract methods to the current API signature files. This change does the same for the corresponding previously released API files to avoid those additional methods being incorrectly treated as new methods when they did exist in previous versions. Test: m checkapi Bug: 299366704 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:58b9adc11ff03225b9df98c482e125374d37afe5) Merged-In: If78491a61ada613271d2d9d40c60c5c9f8c031ce Change-Id: If78491a61ada613271d2d9d40c60c5c9f8c031ce
2023-11-08Update AndroidX from existing prebuiltsnatnaelbelay
Arguments: --upstream goog/udc-mainline-prod Test: prebuilts Change-Id: I0a0e2f7fe3bdd20769b920a69f3f2c1f9e36bbd7 Merged-In: I62d64bbf388c19937e53b70e5a41d25ecdac28f7
2023-11-07Add missing method overrides to previously released APIPaul Duffin
Applies corrections that were applied to the current API files to the previously released API files to avoid those additional methods being incorrectly treated as new methods when they did exist in previous versions. This applies the corrections that were added to the current API files in: * https://r.android.com/2743812 * https://r.android.com/2786581 Test: m checkapi Bug: 299366704 (cherry picked from https://android-review.googlesource.com/q/commit:1b406b34df258c8a5e01651112390259150e5005) Merged-In: I3b8b68d97acd7cbadbf278f4eab9ec5ed28792a4 Change-Id: I3b8b68d97acd7cbadbf278f4eab9ec5ed28792a4
2023-11-01Snap for 11035523 from 6107d8d9955ed1d91fdd4238ce4a8830a12ccddb to ↵Android Build Coastguard Worker
mainline-extservices-release Change-Id: Ie911be3f8e1c7ad6d8af369b119c4f0d51e69264
2023-10-31Import AndroidX from build 10953215 am: 91aaadc356Toshiki Kikuchi
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/sdk/+/25068815 Change-Id: Ib0e004ea1a996ee3daa0156175d72babf910cd36 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-17Import AndroidX from build 10953215Toshiki Kikuchi
./update_prebuilts.py -x 10953215 --include androidx.test.uiautomator Bug: 303752326 Test: GtsIncidentManagerTestCases Change-Id: Ie6b6e0b1bfdc87d38137760a9ae3d93f92245a3e Merged-In: Ie6b6e0b1bfdc87d38137760a9ae3d93f92245a3e
2023-10-13Merge "Add missing method overrides to previously released API" into ↵Paul Duffin
udc-mainline-prod
2023-10-13Merge "Add missing method overrides to previously released API" into ↵Paul Duffin
udc-mainline-prod
2023-10-13Add missing method overrides to previously released APIPaul Duffin
The accompanying change in the topic adds some missing concrete overrides of abstract methods to the current API signature files. This change does the same for the corresponding previously released API files to avoid those additional methods being incorrectly treated as new methods when they did exist in previous versions. Test: m checkapi Bug: 299366704 Change-Id: I0d0c3e20b2568921935753a1a476fe455515be76
2023-10-13Add missing method overrides to previously released APIPaul Duffin
The accompanying change in the topic adds some missing concrete overrides of abstract methods to the current API signature files. This change does the same for the corresponding previously released API files to avoid those additional methods being incorrectly treated as new methods when they did exist in previous versions. Test: m checkapi Bug: 299366704 (cherry picked from https://android-review.googlesource.com/q/commit:f784e68c28b79ba21cf2260a0534500ba724d6b0) Merged-In: Id3b664251b3e99954db35cf6688bc18b8425fa5c Change-Id: Id3b664251b3e99954db35cf6688bc18b8425fa5c
2023-10-13Add missing method overrides to previously released APIPaul Duffin
The accompanying change in the topic adds some missing concrete overrides of abstract methods to the current API signature files. This change does the same for the corresponding previously released API files to avoid those additional methods being incorrectly treated as new methods when they did exist in previous versions. Test: m checkapi Bug: 299366704 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1c1aea7b899daef6764673c87d451e6506783481) Merged-In: I39a640a626891f504599f68ba733a5d360c174a9 Change-Id: I39a640a626891f504599f68ba733a5d360c174a9
2023-10-12Add missing method overrides to previously released APIPaul Duffin
The accompanying change in the topic adds some missing concrete overrides of abstract methods to the current API signature files. This change does the same for the corresponding previously released API files to avoid those additional methods being incorrectly treated as new methods when they did exist in previous versions. Test: m checkapi Bug: 299366704 Change-Id: Ic4c25891941e91a432b9721118daf27b6a1923f5
2023-10-06Merge "Import AndroidX from build 10557707" into udc-mainline-prodHan Li
2023-10-05Import AndroidX from build 10557707Anvesh Renikindi
./update_prebuilts.py -x --include androidx.datastore 10557707 This is to CP Datastore package from Main to udc-mp. NOTE: It was not working since udc-mp doesn't support some RX library: `error: prebuilts/sdk/current/androidx/Android.bp:3199:1: "androidx.datastore_datastore-rxjava2-nodeps" depends on undefined module "kotlinx_coroutines_rx2".` (https://android-build.corp.google.com/artifact/pending/P60621947/test_suites_x86_64/latest/view/logs%2Fbuild_error.log) Instead, I remove Rx related libraries from the .bp file while keeping dropping the Rx jars. Based on the package hierarchy, Adservices may not need these Rx libraries. We can try to develop with PDS without these Rx libraries and add them back if needed. Bug: 303680351 Change-Id: I27a359af53c704be8ad8639b632a1a9678840bcc Merged-In: I27a359af53c704be8ad8639b632a1a9678840bcc Test: Treehugger (cherry picked from commit 2da1dc2021ba1ea811542fad7f7fa8610ffeb0b6)
2023-09-06Update finalized ART API to include bug fixesPaul Duffin
A couple of bug fixes in metalava caused changes to the API txt file for art which caused some Gantry gate failures because it detected a change in the file and assumed it was an API change. The simplest way to fix that is to just apply the same delta to the already finalized API against which the gate is comparing the current API. This change does just that, it modifies both the 34 and extension 7 version of the files as they are identical and the patch (see b/299080058 for the diff) applied 100% cleanly, i.e. no line offsets. FTR the ART changes being applied here are: * https://r.android.com/2631169 * https://r.android.com/2594135. Bug: 299080058 Test: leave it up to the gantry gate Change-Id: I178c73a209454392a65307f109265db9557f15b2
2023-09-02Snap for 10755325 from 81c2e061e0210ffe3547a34026e069d0f5d16722 to ↵aml_ext_341131030Android Build Coastguard Worker
mainline-extservices-release Change-Id: Ic9c9b97825ee753324ab5935a9efcb51a995ea7b
2023-09-02Snap for 10754184 from fa30f133bfa9927571c59c950355474e9894b1e0 to ↵Android Build Coastguard Worker
mainline-extservices-release Change-Id: I284db64c5a65480170ac3e5a4803b10828272ed3
2023-09-01Finalize artifacts for extension SDK 10My Name
Import from build id 10744089. Generated with: $ packages/modules/common/tools/finalize_sdk.py -f 10 -b 298437362 -r 'Finalized in August 2023 (tethering, adservices, appsearch and health connect)' -m com.google.android.adservices -m com.google.android.appsearch -m com.google.android.healthfitness -m com.google.android.tethering 10744089 Bug: 298437362 Test: presubmit Change-Id: If4d83792b2f9238ea683873738bfcfb27fdad93d
2023-08-14Import AndroidX from build 10627966 am: 49fd8fbc8dYichun Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/sdk/+/24404346 Change-Id: I91b28d89519190046c2e9a17b558810960db0911 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-11Import AndroidX from build 10627966Yichun Li
Update UiAutomator from alpha04 to alpha05. Test: presubmit (cherry picked from https://android-review.googlesource.com/q/commit:e60b4769dee3f4c80128f08a51f3316c548fd4df) Merged-In: I46e1d4d89bbc39e207f91fb189d4eec3b2191d13 Change-Id: I46e1d4d89bbc39e207f91fb189d4eec3b2191d13 fix b/294288361 and b/286553275
2023-08-04Snap for 10611805 from 66917932898f1c5719c0d0edf97bbcd0cbf5718d to ↵aml_ext_341027030Android Build Coastguard Worker
mainline-extservices-release Change-Id: I5bb3d68b3f6839c4b9a094683330185f74e47a69
2023-08-03Finalize artifacts for extension SDK 9My Name
Import from build id 10598493. Generated with: $ packages/modules/common/tools/finalize_sdk.py -f 9 -b 294222367 -r 'Finalized in August 2023 between U and V (adServices)' -m com.google.android.adservices 10598493 Bug: 294222367 Test: presubmit Change-Id: I82a8fa011a3462fce650ea2f882cc18547a6bf0e
2023-08-01Snap for 10594189 from 8b3c44754e41038c4954fe2f074216c8730dfbc4 to ↵Android Build Coastguard Worker
mainline-extservices-release Change-Id: Id53013c5bbf2c6043eea8580b5efb0c0e3c3b398
2023-07-28[automerger skipped] Update aaos prebuilts am: 8a1858549f am: c9891115b5 -s ↵Saeid Farivar Asanjan
ours am: db8aeeca0c -s ours am: f7337cd89b -s ours am skip reason: skipped by user farivar Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/sdk/+/24021839 Change-Id: I4703bda9a3b334a7886deb5f0427a156481b332b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28[automerger skipped] Update aaos prebuilts am: 8a1858549f am: c9891115b5 -s ↵Saeid Farivar Asanjan
ours am: db8aeeca0c -s ours am skip reason: skipped by user farivar Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/sdk/+/24021839 Change-Id: I8db57fd42f3276e52e58393f26cc9d7e6a4c9b86 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28[automerger skipped] Update aaos prebuilts am: 8a1858549f am: c9891115b5 -s oursSaeid Farivar Asanjan
am skip reason: skipped by user farivar Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/sdk/+/24021839 Change-Id: Ia05b945a4483d0cb040b02ecb09e0b71f1eddbc7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27[automerger skipped] [conflict] Update aaos prebuilts am: 8a1858549f am: ↵Saeid Farivar Asanjan
c9891115b5 am: 0ffa17952d -s ours am: 608ed55245 -s ours am skip reason: Merged-In Iaccfd2cd09290960c95414293800d9540010d661 with SHA-1 48534fb622 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/sdk/+/24212119 Change-Id: Id320438e17898797ed031fc59cbba3868eafed3f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27[automerger skipped] [conflict] Update aaos prebuilts am: 8a1858549f am: ↵Saeid Farivar Asanjan
c9891115b5 am: 0ffa17952d -s ours am skip reason: Merged-In Iaccfd2cd09290960c95414293800d9540010d661 with SHA-1 48534fb622 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/sdk/+/24212119 Change-Id: Icce6c32bd41678c5cd16999d9dd2c41c4af48b36 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27[conflict] Update aaos prebuilts am: 8a1858549f am: c9891115b5Saeid Farivar Asanjan
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/sdk/+/24021839 Change-Id: I27d029366479159edcd6f5fa44546ecb5a4faa85 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Merged-In: Idb986340ab943493c92de2e498fc6e4d6778beb0 Merged-In: I505731cf63500d5222fea33d285da7818a549d84 Merged-In: Iaccfd2cd09290960c95414293800d9540010d661
2023-07-26[automerger skipped] Update aaos prebuilts am: 8a1858549f am: 99dc43d960 -s ↵Saeid Farivar Asanjan
ours am: d9ac764504 -s ours am skip reason: Merged-In Iaccfd2cd09290960c95414293800d9540010d661 with SHA-1 48534fb622 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/sdk/+/24021839 Change-Id: I1346d8054155bc632492a473af3f5ee56243cab4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26[automerger skipped] Update aaos prebuilts am: 8a1858549f am: 99dc43d960 -s oursSaeid Farivar Asanjan
am skip reason: Merged-In Iaccfd2cd09290960c95414293800d9540010d661 with SHA-1 48534fb622 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/sdk/+/24021839 Change-Id: I648cda93b77daa964fb40951c3795f7e00811269 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26Merge "Import uiautomator 10508672" into udc-dev am: 842074f5f8Yichun Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/sdk/+/24194779 Change-Id: Ib0f75e0479ec0f90c6e2633587d11591bed99007 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26Update aaos prebuilts am: 8a1858549fSaeid Farivar Asanjan
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/sdk/+/24021839 Change-Id: Ibbdf7a779522acc2c10cad2dd2e3aeda03444296 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26Update aaos prebuilts am: 8a1858549fSaeid Farivar Asanjan
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/sdk/+/24021839 Change-Id: I99c607daf2e381446170ff5063ce273dd7ec272c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26Merge "Import uiautomator 10508672" into udc-devYichun Li
2023-07-26Snap for 10564365 from ca05c528f64a57956dcaf213580823cf8f7cf201 to ↵Android Build Coastguard Worker
mainline-extservices-release Change-Id: I96d5c6f6b26e9d778b3ddaed1015c5ff1ce6424e
2023-07-25Update aaos prebuilts am: 48534fb622Saeid Farivar Asanjan
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/sdk/+/24023062 Change-Id: Iaea28cbc5899c1aadee5b407c0fe981cae69eff7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25Import uiautomator 10508672Yichun Li
Test: presubmit (cherry picked from https://android-review.googlesource.com/q/commit:ced000568ef1ee8690ff244197243683109e68b2) Merged-In: I7c1c7f45c0a94ff99535ec4a328f729a97c7a3c3 Change-Id: I7c1c7f45c0a94ff99535ec4a328f729a97c7a3c3 Bug: 286553275
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 03:58:24 +0000