)]}' { "log": [ { "commit": "7562dd2bbcfd47e4126d73325b57aa86b452a9db", "tree": "bae3bf14c7ca669e4b05a67e168ce7d88c22fa9d", "parents": [ "e2217289c54d8fa510a1c49fa29e7a802e16507e", "83251dee8267445f991e8344261d2a73f4c110ff" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Mar 08 16:10:00 2025 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Mar 08 16:10:00 2025 -0800" }, "message": "Merge 25Q1 (ab/BP1A.250305.020) to AOSP main\n\nBug: 385190204\nMerged-In: I1be59d807a8a3c2e8a9b6a8179784a8eb58fef83\nChange-Id: Id65310f3f7b134c5c666c92ecae6e33726a7eeef\n" }, { "commit": "83251dee8267445f991e8344261d2a73f4c110ff", "tree": "bae3bf14c7ca669e4b05a67e168ce7d88c22fa9d", "parents": [ "b8f5d3ac3b43df1d5565709750bba95955c68ea6", "e2217289c54d8fa510a1c49fa29e7a802e16507e" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Mar 04 08:32:17 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 04 08:32:17 2025 -0800" }, "message": "Merge \"bump_sdk.sh: fix Ignore-AOSP-First typo\" into main am: e2217289c5\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3523192\n\nChange-Id: I94335870b8adfe001eb0c8056902229dbe78f1f4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e2217289c54d8fa510a1c49fa29e7a802e16507e", "tree": "37ecb627c9a7e83c17b0a6b34f694ea78119cefd", "parents": [ "b36c5ba8f1da3b1caecd2b45a1466760858c1761", "91657d1e433ff880f753d712d834cfce3e0309e1" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Mar 04 08:01:49 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Mar 04 08:01:49 2025 -0800" }, "message": "Merge \"bump_sdk.sh: fix Ignore-AOSP-First typo\" into main" }, { "commit": "91657d1e433ff880f753d712d834cfce3e0309e1", "tree": "4732a4a70fb88c0a10e261ba62a917d306f8bc5b", "parents": [ "92000da9256033b0def7cb327342bc26d36d0cdb" ], "author": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Tue Mar 04 15:23:43 2025 +0100" }, "committer": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Tue Mar 04 15:23:43 2025 +0100" }, "message": "bump_sdk.sh: fix Ignore-AOSP-First typo\n\nIt\u0027s Ignore-AOSP-First (upper-case F), not Ignore-AOSP-first.\n\nTest: treehugger\nFlag: EXEMPT trivial typo fix\nChange-Id: Ib762484e8033600049c9662571b8a0535092574a\n" }, { "commit": "b8f5d3ac3b43df1d5565709750bba95955c68ea6", "tree": "3a9c708917906edc96a2f0d93c0f34bf1c6f93dd", "parents": [ "8bf4660b1a047c370157c934807a5b41b365f6ec", "b36c5ba8f1da3b1caecd2b45a1466760858c1761" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Sun Mar 02 23:54:42 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Mar 02 23:54:42 2025 -0800" }, "message": "Cleanup python version properties am: b36c5ba8f1\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3516891\n\nChange-Id: Ieb66b140a10e64d0afbe2f935e3e4e0641e8a138\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b36c5ba8f1da3b1caecd2b45a1466760858c1761", "tree": "fd2cbfc9a68988c998e37e30735d293cbf673a96", "parents": [ "89360cae32d0df410f5d7dabaefdd0802748fc12" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Fri Feb 28 16:34:06 2025 -0800" }, "committer": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Fri Feb 28 16:34:06 2025 -0800" }, "message": "Cleanup python version properties\n\nNow that python 2 is fully removed, there\u0027s no need for\nversion-specific properties. Remove them.\n\nAlso remove usages of embedded_launcher: true, as that\nis the new default value.\n\nBug: 399954452\nTest: Presubmits\nChange-Id: I377fe2146613d6492696688c030d8689e53a33a9\n" }, { "commit": "8bf4660b1a047c370157c934807a5b41b365f6ec", "tree": "b23fc2609673d43b8213a472add4796d3439cadc", "parents": [ "3ed9766b65322ef207b507849ffca0a234ed8e63", "ec8bfb638ae43e37ceb0b5fa204ef0a42ff89e39" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Feb 27 15:13:21 2025 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Feb 27 15:13:21 2025 -0800" }, "message": "Merge \"Merge 25Q1 (ab/12770256) to aosp-main-future\" into aosp-main-future" }, { "commit": "3ed9766b65322ef207b507849ffca0a234ed8e63", "tree": "249d93fd496de133b984fc5c8c3cc4af26e0f079", "parents": [ "0c052cf33e42137b91c507694b85fce46f51fd4f", "89360cae32d0df410f5d7dabaefdd0802748fc12" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Thu Feb 27 13:34:05 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 27 13:34:05 2025 -0800" }, "message": "Remove unused sdkext-released-flagged-apis and associated script am: 89360cae32\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3514073\n\nChange-Id: I95d4d7411e8beea5fdd772fe48dea43e0d2b4cf1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "89360cae32d0df410f5d7dabaefdd0802748fc12", "tree": "249d93fd496de133b984fc5c8c3cc4af26e0f079", "parents": [ "92000da9256033b0def7cb327342bc26d36d0cdb" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Thu Feb 27 19:02:07 2025 +0000" }, "committer": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Thu Feb 27 19:02:07 2025 +0000" }, "message": "Remove unused sdkext-released-flagged-apis and associated script\n\nIt was added for `udc-mainline-prod` and so is no longer needed.\n\nBug: 316383039\nTest: TH\nChange-Id: Ife7e06ae2a2752e8d1461ee8f32acb1d5eb51b9c\n" }, { "commit": "ec8bfb638ae43e37ceb0b5fa204ef0a42ff89e39", "tree": "456eec04626273ec8411534c727a3d10428d1d26", "parents": [ "0c052cf33e42137b91c507694b85fce46f51fd4f", "738fa51d542c3433d0cba86768bfcf790c7fcccc" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Feb 21 13:51:57 2025 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Feb 21 13:51:57 2025 -0800" }, "message": "Merge 25Q1 (ab/12770256) to aosp-main-future\n\nBug: 385190204\nMerged-In: I592d826af6e2e9831d5779aa4e44dcfb51b0aba8\nChange-Id: Ia34b31d676645efc9550135ae003d77e54a3c282\n" }, { "commit": "0c052cf33e42137b91c507694b85fce46f51fd4f", "tree": "f87806f2dbedd9fe67a205892c55b8c421a9f11a", "parents": [ "445fb260e25e838342a47af90066b969c12e921a", "92000da9256033b0def7cb327342bc26d36d0cdb" ], "author": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Fri Feb 21 12:08:14 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Feb 21 12:08:14 2025 -0800" }, "message": "Relax device code name requirement in derive_classpath am: 92000da925\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3500397\n\nChange-Id: I2dcb0746af826d0376ef98fe9c0e1bb1198c83d4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "92000da9256033b0def7cb327342bc26d36d0cdb", "tree": "f87806f2dbedd9fe67a205892c55b8c421a9f11a", "parents": [ "d0b6f5119e83569dc5acc227875275daa86d35a1" ], "author": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Fri Feb 21 04:37:34 2025 -0800" }, "committer": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Fri Feb 21 04:37:34 2025 -0800" }, "message": "Relax device code name requirement in derive_classpath\n\nIf --override-device-codename is set to \"REL\", the known codenames are not needed.\n\nBug: 377474232\nTest: out/host/linux-x86/bin/derive_classpath \\\n --glob-pattern-prefix\u003d$HOME/tmp/device \\\n --override-device-sdk-version\u003d35 \\\n --override-device-codename\u003dREL \\\n $HOME/tmp/classpath\n\nChange-Id: I7c72c3a159f0ec9181138841d4c09befef5eff19\n" }, { "commit": "445fb260e25e838342a47af90066b969c12e921a", "tree": "8f00a50b2a2177946883b6d8157e5efb5e4ad01f", "parents": [ "99268c5c15cfc26ef9cb65aee2210bf4f774a0aa", "d0b6f5119e83569dc5acc227875275daa86d35a1" ], "author": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Fri Feb 21 02:21:12 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Feb 21 02:21:12 2025 -0800" }, "message": "Merge \"Create sdkextensions-host-exports to contain a host derive_classpath\" into main am: d0b6f5119e\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3500731\n\nChange-Id: I637415121832481bdf78b02d9bd0f52053ca13a2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d0b6f5119e83569dc5acc227875275daa86d35a1", "tree": "8f00a50b2a2177946883b6d8157e5efb5e4ad01f", "parents": [ "1ae597b9d4b390cf3efe7a7a3e08e6781e3203eb", "12a30415399a604bfa51dce48580d53e8416034e" ], "author": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Fri Feb 21 01:59:33 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Feb 21 01:59:33 2025 -0800" }, "message": "Merge \"Create sdkextensions-host-exports to contain a host derive_classpath\" into main" }, { "commit": "99268c5c15cfc26ef9cb65aee2210bf4f774a0aa", "tree": "5acff4812ce28a98d35022ad92a00f4b350cc350", "parents": [ "a076b47097301db29fbe7e4befeee49e126e78f6", "1ae597b9d4b390cf3efe7a7a3e08e6781e3203eb" ], "author": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Thu Feb 20 05:35:49 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 20 05:35:49 2025 -0800" }, "message": "bump_sdk.sh: don\u0027t assume path to gen_sdk artifact am: 1ae597b9d4\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3500995\n\nChange-Id: Ifd09cc03db0664661630cfcedad568070c905bf1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a076b47097301db29fbe7e4befeee49e126e78f6", "tree": "1471a12c8d059daee5a2bb5183ab36a53ba86032", "parents": [ "ca101c415b623264936207b2685fdc14071fa62d", "781d059b09bb63dd1c8feaf73ab086c163789e2b" ], "author": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Thu Feb 20 05:35:43 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 20 05:35:43 2025 -0800" }, "message": "bump_sdk.sh: fix broken call to build gen_sdk am: 781d059b09\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3500994\n\nChange-Id: I7712584ac9d2e138752399224a912e610425fa4b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1ae597b9d4b390cf3efe7a7a3e08e6781e3203eb", "tree": "5acff4812ce28a98d35022ad92a00f4b350cc350", "parents": [ "781d059b09bb63dd1c8feaf73ab086c163789e2b" ], "author": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Thu Feb 20 13:09:44 2025 +0100" }, "committer": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Thu Feb 20 13:13:51 2025 +0100" }, "message": "bump_sdk.sh: don\u0027t assume path to gen_sdk artifact\n\nSoong has changed where it stores the generated gen_sdk binary. Update\nbump_sdk.sh to not hard-code a path. Call gen_sdk implicitly instead by\nrelying on PATH.\n\nTest: croot \u0026\u0026 ./packages/modules/SdkExtensions/gen_sdk/bump_sdk.sh 1234\nBug: 392838750\nBug: 397639913\nFlag: EXEMPT change to host side script\nChange-Id: Iad8331f303dcd10813df9aad480a40821b273a67\n" }, { "commit": "781d059b09bb63dd1c8feaf73ab086c163789e2b", "tree": "1471a12c8d059daee5a2bb5183ab36a53ba86032", "parents": [ "cbe3e0ed5767271c615b813ba8ab49d7c45aa888" ], "author": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Thu Feb 20 13:05:07 2025 +0100" }, "committer": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Thu Feb 20 13:13:51 2025 +0100" }, "message": "bump_sdk.sh: fix broken call to build gen_sdk\n\nUpdate how bump_sdk.sh builds the gen_sdk binary. Instead of calling\nsoong_ui.sh, which used to work but now fails with the error\n\n internal error: panic in GenerateBuildActions for singleton dexpreopt-soong-config\n BOARD_KERNEL_VERSION is not set. Build team will convert more stuff from Make to Soong to support this scenario.\n\ncall `m gen_sdk` instead.\n\nTest: m gen_sdk # calling bump_sdk.sh doesn\u0027t work without upcoming CLs\nBug: 392838750\nBug: 397641039\nFlag: EXEMPT change to host side script\nChange-Id: I6e573983fd5837f4e1a1b2dd1492c31674b22526\n" }, { "commit": "12a30415399a604bfa51dce48580d53e8416034e", "tree": "6e547ca89d06ec27c512f5ec64c069383051c2a3", "parents": [ "cbe3e0ed5767271c615b813ba8ab49d7c45aa888" ], "author": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Wed Feb 19 14:57:42 2025 +0000" }, "committer": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Wed Feb 19 16:19:21 2025 +0000" }, "message": "Create sdkextensions-host-exports to contain a host derive_classpath\n\nderive_classpath has fairly complicated logic. To allow app stores\nconsistently get the bootclasspath for compiling bootclasspath and apps\non the server, we need to provide a host tool for it.\n\nThis can also be used in APK Scanner and Image Scanner, to simply their\nlogic.\n\nBug: 377474232\nTest: out/host/linux-x86/bin/derive_classpath \\\n --glob-pattern-prefix\u003d$HOME/tmp/device \\\n --override-device-sdk-version\u003d35 \\\n --override-device-codename\u003dBaklava \\\n --override-device-known-codenames\u003dBase,Base11,Cupcake,Donut,Eclair,Eclair01,EclairMr1,Froyo,Gingerbread,GingerbreadMr1,Honeycomb,HoneycombMr1,HoneycombMr2,IceCreamSandwich,IceCreamSandwichMr1,JellyBean,JellyBeanMr1,JellyBeanMr2,Kitkat,KitkatWatch,Lollipop,LollipopMr1,M,N,NMr1,O,OMr1,P,Q,R,S,Sv2,Tiramisu,UpsideDownCake,VanillaIceCream,Baklava \\\n $HOME/tmp/classpath\nChange-Id: I32b2a13b5bc3be60683fb1a8e9ec9c69d4402fc5\n" }, { "commit": "ca101c415b623264936207b2685fdc14071fa62d", "tree": "a591aa938b199ed158296ba448a7ff06651fe50d", "parents": [ "328d6382c0a551c38e3fb6bf2169159284b90406", "cbe3e0ed5767271c615b813ba8ab49d7c45aa888" ], "author": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Wed Jan 15 09:08:44 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 15 09:08:44 2025 -0800" }, "message": "derive_classpath: Support overriding device version values. am: cbe3e0ed57\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3444983\n\nChange-Id: I7ed10f469241c7eae3e07133eb93d5dfe94c10d2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "cbe3e0ed5767271c615b813ba8ab49d7c45aa888", "tree": "a591aa938b199ed158296ba448a7ff06651fe50d", "parents": [ "41bf0c2c4fca133303aba71f9a8d14c1b91eb131" ], "author": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Wed Jan 15 06:19:03 2025 -0800" }, "committer": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Wed Jan 15 06:19:03 2025 -0800" }, "message": "derive_classpath: Support overriding device version values.\n\nBug: 388797804\nChange-Id: I6ea129e1014109a343f21f69663ce9d5e7739855\nTest: atest derive_classpath_test\n" }, { "commit": "328d6382c0a551c38e3fb6bf2169159284b90406", "tree": "a5fa329337e9e0d4427135b44e83e7dbe5fb5964", "parents": [ "5c3ab34c57d1317caeb1669afb19848f92443082", "41bf0c2c4fca133303aba71f9a8d14c1b91eb131" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 13 18:26:33 2024 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 13 18:26:33 2024 -0800" }, "message": "[automerger skipped] Merge 24Q4 into AOSP main am: 41bf0c2c4f -s ours\n\nam skip reason: Merged-In I12fe43b3f2d6a1c291f9a0cd2f7243000ae648f1 with SHA-1 05c0f2f263 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3414097\n\nChange-Id: I1aace13f05229fccb40c86358c88b10a23005a5d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "41bf0c2c4fca133303aba71f9a8d14c1b91eb131", "tree": "a5fa329337e9e0d4427135b44e83e7dbe5fb5964", "parents": [ "9e81006080e00838e5713b922c243b58569c8e53", "5c3ab34c57d1317caeb1669afb19848f92443082" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 13 11:15:23 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 13 11:15:23 2024 -0800" }, "message": "Merge 24Q4 into AOSP main\n\nBug: 370570306\nMerged-In: I12fe43b3f2d6a1c291f9a0cd2f7243000ae648f1\nChange-Id: Ieae63dd285bb30e028f7f4f2a640ef3deb760e05\n" }, { "commit": "738fa51d542c3433d0cba86768bfcf790c7fcccc", "tree": "2cb776768430d72b7bb6ffc8280c4c4ef32b3b8a", "parents": [ "ec6ef00ff8cfa9148dc66c33f35f90f2216a7264" ], "author": { "name": "Mainline Sdk Release Releaser", "email": "mainline-sdk-release-releaser@prod.google.com", "time": "Thu Dec 05 13:51:46 2024 +0000" }, "committer": { "name": "Mainline Sdk Release Releaser", "email": "mainline-sdk-release-releaser@prod.google.com", "time": "Thu Dec 05 13:51:51 2024 +0000" }, "message": "Bump SDK Extension version to 16\n\nGenerated via Gantry with:\n$ packages/modules/SdkExtensions/gen_sdk/gen_sdk.py --database packages/modules/SdkExtensions/gen_sdk/extensions_db.textpb --action new_sdk --sdk 16 --modules HEALTH_FITNESS,MEDIA_PROVIDER,TETHERING,APPSEARCH,AD_SERVICES,EXT_SERVICES,ON_DEVICE_PERSONALIZATION\n\nDatabase update generated via Gantry with:\n$ gen_sdk --action new_sdk --sdk 16\n\nChange-Id: I592d826af6e2e9831d5779aa4e44dcfb51b0aba8\nIgnore-AOSP-first: SDKs are finalized outside of AOSP\nFlag: EXEMPT SDK finalization is not flagged\nBug: 379269157\nTest: presubmit\n" }, { "commit": "ec6ef00ff8cfa9148dc66c33f35f90f2216a7264", "tree": "42a77e96cbed6ac3ec31290119525f62a56796d7", "parents": [ "1d0d1f4a2b78efbff0559f79e20780917e6c4be7" ], "author": { "name": "Roman Didukh", "email": "rdidukh@google.com", "time": "Wed Dec 04 13:28:56 2024 +0000" }, "committer": { "name": "Roman Didukh", "email": "rdidukh@google.com", "time": "Wed Dec 04 13:28:56 2024 +0000" }, "message": "[HealthFitness] Add Activity Intensity data type to sdk extentions.\n\nIgnore-AOSP-First: Need to merge in main first as per discussion with sdk-extention team.\n\nChange-Id: I57eea756f378d825e2966c35906298b9d335a49a\nTest: m sdk dist\nFlag: com.android.healthfitness.flags.activity_intensity\nBug: 373585917\n" }, { "commit": "1d0d1f4a2b78efbff0559f79e20780917e6c4be7", "tree": "a6549d40c759bead61b34661794baf16416a8eec", "parents": [ "a4a1ad82fba48bcd8b64402a07e08ecf2686ced9", "1096c41bf20204115cf72001cec3101cbe6a32a8" ], "author": { "name": "Darshil Shah", "email": "darshilshah@google.com", "time": "Thu Nov 28 04:50:38 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Nov 28 04:50:38 2024 +0000" }, "message": "Merge \"Add new symbols to SDK extensions info file for mediaprovider jar\" into main" }, { "commit": "1096c41bf20204115cf72001cec3101cbe6a32a8", "tree": "62ff8845951383ebe34f19b548feb851cb10afb4", "parents": [ "c3ba86ee35a64489c90c4d334c11d26a6543143a" ], "author": { "name": "darshilshah", "email": "darshilshah@google.com", "time": "Wed Nov 27 07:09:54 2024 +0000" }, "committer": { "name": "darshilshah", "email": "darshilshah@google.com", "time": "Wed Nov 27 07:14:06 2024 +0000" }, "message": "Add new symbols to SDK extensions info file for mediaprovider jar\n\nTest: n/a\nBug: 294364218\nIgnore-AOSP-First: n/a\nFlag: EXEMPT not applicable\nChange-Id: I6328a025efe6c4aff4fa135959d0d921acf5a102\n" }, { "commit": "a4a1ad82fba48bcd8b64402a07e08ecf2686ced9", "tree": "642fe725c69c7c2780c2c1ad3fde442a33f9f621", "parents": [ "72c5486aac531bbfb6648025b44509336a98ecc0", "5c3ab34c57d1317caeb1669afb19848f92443082" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Nov 13 22:33:57 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 13 22:33:57 2024 +0000" }, "message": "[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: 5c3ab34c57 -s ours\n\nam skip reason: Merged-In I12fe43b3f2d6a1c291f9a0cd2f7243000ae648f1 with SHA-1 05c0f2f263 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/30283759\n\nChange-Id: Ib834f8af8e1fc42a108752360fa3e7b8e1cdce96\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "72c5486aac531bbfb6648025b44509336a98ecc0", "tree": "642fe725c69c7c2780c2c1ad3fde442a33f9f621", "parents": [ "481ed5d44376c76d2296c8ad1b3fffbfe7ec48d7", "727932958df8846fcd4abf44284ac0101bd8d0d9" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Nov 07 17:15:31 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Nov 07 17:15:31 2024 +0000" }, "message": "Merge \"[HealthFitness] Add health connect PHR APIs to sdk extentions\" into main" }, { "commit": "727932958df8846fcd4abf44284ac0101bd8d0d9", "tree": "6a6d33b9db5da34f328ddbb838ec5cd967a907b8", "parents": [ "c3ba86ee35a64489c90c4d334c11d26a6543143a" ], "author": { "name": "Leo", "email": "itsleo@google.com", "time": "Fri Nov 01 14:58:34 2024 +0000" }, "committer": { "name": "Leo", "email": "itsleo@google.com", "time": "Thu Nov 07 15:07:15 2024 +0000" }, "message": "[HealthFitness] Add health connect PHR APIs to sdk extentions\n\nThese APIs are planned to be shipped in M-02 25, hence adding them to\nthe SDK extensions.\n\nThis CL is done by following what\u0027s been done in ag/28362024.\n\nTest: m sdk dist\nFix: 361775342\nFlag: NONE enabling healthfitness api updatability no flag needed\nIgnore-AOSP-First: Need to merge in main first as per discussion with\nsdk-extention team.\n\nChange-Id: Ie22aa3fc4d777da10ecb45632cc1463f258beae5\n" }, { "commit": "5c3ab34c57d1317caeb1669afb19848f92443082", "tree": "a5fa329337e9e0d4427135b44e83e7dbe5fb5964", "parents": [ "656a21671eef173a8ed48647c7484f96855f62b2", "2faa5fcdd1579d91dde3564a6749bf744490c31b" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Nov 06 12:22:17 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Nov 06 12:22:17 2024 -0800" }, "message": "Merge 24Q4 (ab/12406339) into aosp-main-future\n\nBug: 370570306\nMerged-In: I12fe43b3f2d6a1c291f9a0cd2f7243000ae648f1\nChange-Id: I7c0d3e4a558c28b5221ee88e01777ec5c7a69c96\n" }, { "commit": "481ed5d44376c76d2296c8ad1b3fffbfe7ec48d7", "tree": "a5fa329337e9e0d4427135b44e83e7dbe5fb5964", "parents": [ "c3ba86ee35a64489c90c4d334c11d26a6543143a", "656a21671eef173a8ed48647c7484f96855f62b2" ], "author": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Fri Nov 01 16:14:48 2024 +0100" }, "committer": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Fri Nov 01 16:14:48 2024 +0100" }, "message": "Resolve merge conflict \u0027656a21671eef173a8ed48647c7484f96855f62b2\u0027 into manual_merge_656a21671eef173a8ed48647c7484f96855f62b2\n\nTest: treehugger\nBug: 376425906\nChange-Id: I38780986e68f46093b0fe3876966d8c36096f3f3\n" }, { "commit": "656a21671eef173a8ed48647c7484f96855f62b2", "tree": "43747936b6bb7245b55a661c1f8ece07182fbb11", "parents": [ "2de6e2a866d5d1ce6bf8f9d07262cd18f669d782", "9e81006080e00838e5713b922c243b58569c8e53" ], "author": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Fri Nov 01 14:13:14 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Nov 01 14:13:14 2024 +0000" }, "message": "Update OWNERS to match SDK_OWNERS am: 9e81006080\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3326640\n\nChange-Id: If29cddc9f3af77e63cd204c5617c953e6927664d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9e81006080e00838e5713b922c243b58569c8e53", "tree": "43747936b6bb7245b55a661c1f8ece07182fbb11", "parents": [ "399206d8c31c40e1111e2b3e12940bf4d3b473a2" ], "author": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Fri Nov 01 13:37:53 2024 +0100" }, "committer": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Fri Nov 01 13:37:53 2024 +0100" }, "message": "Update OWNERS to match SDK_OWNERS\n\nReplace old OWNERS with the new centralized SDK_OWNERS file.\n\nBug: 376425906\nTest: treehugger\nFlag: EXEMPT OWNERS update\nChange-Id: Ic8c656de63e8a9c2be88d264cae83fc7a2d8c9a8\n" }, { "commit": "c3ba86ee35a64489c90c4d334c11d26a6543143a", "tree": "5ca4285a1ce48cdbaee5c75b1407a5eb2df0a6fc", "parents": [ "e48eca64269e8504dc7be4bacdee2332a715a038", "2de6e2a866d5d1ce6bf8f9d07262cd18f669d782" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Wed Oct 23 01:58:47 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 23 01:58:47 2024 +0000" }, "message": "Remove dependencies on the 1-variant fallback am: 399206d8c3 am: 2de6e2a866\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3317605\n\nChange-Id: I987306b18150fe88a1a7ce322e781783cc582c57\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2de6e2a866d5d1ce6bf8f9d07262cd18f669d782", "tree": "c481bd4ed7165e6e6660a4d5dbb494b125e6b1fd", "parents": [ "04f8c010f06efb2638adaebb174eaacdfb30ff22", "399206d8c31c40e1111e2b3e12940bf4d3b473a2" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Wed Oct 23 01:35:46 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 23 01:35:46 2024 +0000" }, "message": "Remove dependencies on the 1-variant fallback am: 399206d8c3\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3317605\n\nChange-Id: I90aa856a1e0825ad995614fdb1f05f1bb8c2525c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "399206d8c31c40e1111e2b3e12940bf4d3b473a2", "tree": "c481bd4ed7165e6e6660a4d5dbb494b125e6b1fd", "parents": [ "268577d52c7284e8037a1411fc35cabe4c5b8d5a" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Tue Oct 22 16:31:02 2024 -0700" }, "committer": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Tue Oct 22 16:31:02 2024 -0700" }, "message": "Remove dependencies on the 1-variant fallback\n\nWhen adding a dependencies, if the variants don\u0027t match, but the\ndependency only has 1 variant anyways, soong will always use that\nvariant. This makes it hard to add new variants to soong, because the\n1-variant fallback stops being used and you start getting missing\nvariant errors. Make changes to bp files such that all dependencies\ncorrectly specify the variant to use.\n\nBug: 372091092\nFlag: EXEMPT refactor\nTest: m nothing\nChange-Id: I79b796b2dbde81d25565e823bf8ba1f3504bfd9c\n" }, { "commit": "e48eca64269e8504dc7be4bacdee2332a715a038", "tree": "2d42b726752d9ca2621634356c0f219296cdc950", "parents": [ "d51877b710b08e15749a784509f79a5e72e5821b", "04f8c010f06efb2638adaebb174eaacdfb30ff22" ], "author": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Thu Oct 03 11:59:06 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 03 11:59:06 2024 +0000" }, "message": "sdk-extensions-info-test: improve error messages am: 268577d52c am: 04f8c010f0\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3290162\n\nChange-Id: I97e0e6cc16da82c4a877e9c572f02faa721e6a3a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d51877b710b08e15749a784509f79a5e72e5821b", "tree": "8cc3945022dcf4952d695b5795b8fed6ce3c72a4", "parents": [ "5853933acbc3498c5d6e4a2274b8c86611e9654b", "8b33e0fc848e80b34f47099d276648cffdb3bc16" ], "author": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Thu Oct 03 11:59:02 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 03 11:59:02 2024 +0000" }, "message": "sdk-extensions-info-test: check for unexpected whitespace am: b4e3142914 am: 8b33e0fc84\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3290101\n\nChange-Id: I98aa8b404dc776d9783deb92d6fd7a692520b900\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "04f8c010f06efb2638adaebb174eaacdfb30ff22", "tree": "94f3d8e4144454cb13a996fd363e8f24514c9a17", "parents": [ "8b33e0fc848e80b34f47099d276648cffdb3bc16", "268577d52c7284e8037a1411fc35cabe4c5b8d5a" ], "author": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Thu Oct 03 11:39:48 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 03 11:39:48 2024 +0000" }, "message": "sdk-extensions-info-test: improve error messages am: 268577d52c\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3290162\n\nChange-Id: I3231a534655c42fe09536fa6f323cc4f7e8fb707\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8b33e0fc848e80b34f47099d276648cffdb3bc16", "tree": "159788effe10df5feb14ba7b842bdcb5e3fff34b", "parents": [ "f5bee4c776e12f09a47de8999e1e5fcfaff72b4c", "b4e3142914a8f3e03a472b42d8a95e29e8df8d63" ], "author": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Thu Oct 03 11:39:44 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 03 11:39:44 2024 +0000" }, "message": "sdk-extensions-info-test: check for unexpected whitespace am: b4e3142914\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3290101\n\nChange-Id: I93b62932ba5bd1235325a9660c42dff15d13a94f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "268577d52c7284e8037a1411fc35cabe4c5b8d5a", "tree": "94f3d8e4144454cb13a996fd363e8f24514c9a17", "parents": [ "b4e3142914a8f3e03a472b42d8a95e29e8df8d63" ], "author": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Thu Oct 03 11:15:40 2024 +0200" }, "committer": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Thu Oct 03 11:15:40 2024 +0200" }, "message": "sdk-extensions-info-test: improve error messages\n\nInclude more context in the error messages.\n\nBug: 370885414\nTest: atest sdk-extensions-info-test\nFlag: EXEMPT unit test\nChange-Id: I143444829d47b6665247e6b78054d3e3cd245407\n" }, { "commit": "5853933acbc3498c5d6e4a2274b8c86611e9654b", "tree": "4d8652c5609aa8ab8e2034a63f7530b568cc6f79", "parents": [ "6ba415de46a16ad1ff8bca14702663d822d92581", "f5bee4c776e12f09a47de8999e1e5fcfaff72b4c" ], "author": { "name": "Tim Barron", "email": "tjbarron@google.com", "time": "Thu Oct 03 08:23:39 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 03 08:23:39 2024 +0000" }, "message": "[automerger skipped] Make the matching pattern for AppSearch broader. am: 8eb4de94c4 am: f5bee4c776 -s ours\n\nam skip reason: Merged-In I3e384292ebccd9db897b8a39948d8d0a2d070c91 with SHA-1 6ba415de46 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3291116\n\nChange-Id: I1b72ac1db53833e54e322a5ecbc3939b22364368\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f5bee4c776e12f09a47de8999e1e5fcfaff72b4c", "tree": "563a8805d3f2ef6ccc40726184eab4ec4f7fee97", "parents": [ "a2904a9b2e8e7bfe80c66b2d63c294b036ef451c", "8eb4de94c41664eafa169f626c6f90cfa4516983" ], "author": { "name": "Tim Barron", "email": "tjbarron@google.com", "time": "Thu Oct 03 08:03:51 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 03 08:03:51 2024 +0000" }, "message": "Make the matching pattern for AppSearch broader. am: 8eb4de94c4\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3291116\n\nChange-Id: I88d7b1b34252b58d2b7948e526bbaebb575691f5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b4e3142914a8f3e03a472b42d8a95e29e8df8d63", "tree": "159788effe10df5feb14ba7b842bdcb5e3fff34b", "parents": [ "8eb4de94c41664eafa169f626c6f90cfa4516983" ], "author": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Wed Oct 02 09:08:40 2024 +0200" }, "committer": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Thu Oct 03 09:55:43 2024 +0200" }, "message": "sdk-extensions-info-test: check for unexpected whitespace\n\nThe \u003csymbol\u003e attributes `jar` and `pattern` are never expected to\ncontain whitespace. Add checks for these.\n\nBug: 370885414\nTest: atest sdk-extensions-info-test\nFlag: EXEMPT unit test\nChange-Id: Ieae9d9f52bf7ad7d995dc4e9bba62a933445a217\n" }, { "commit": "8eb4de94c41664eafa169f626c6f90cfa4516983", "tree": "563a8805d3f2ef6ccc40726184eab4ec4f7fee97", "parents": [ "ae53702d7f960030cd05bb4525c0f57b7b5d181f" ], "author": { "name": "Tim Barron", "email": "tjbarron@google.com", "time": "Thu Oct 03 07:04:39 2024 +0000" }, "committer": { "name": "Android Build Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Thu Oct 03 07:04:39 2024 +0000" }, "message": "Make the matching pattern for AppSearch broader.\n\nThe current pattern is 1) too narrow (it has missed APIs added in\nAndroid U and V that landed in T Extensions) and 2) mis-specified (the\npattern for addIndexableNestedProperties is incorrect).\n\nThis cl updates the pattern to simply be everything under the\nandroid.app.appsearch package.\n\nBug: 370777679\nFlag: DOCS_ONLY\nTest: m docs dist\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6ba415de46a16ad1ff8bca14702663d822d92581)\nMerged-In: I3e384292ebccd9db897b8a39948d8d0a2d070c91\nChange-Id: I3e384292ebccd9db897b8a39948d8d0a2d070c91\n" }, { "commit": "6ba415de46a16ad1ff8bca14702663d822d92581", "tree": "4d8652c5609aa8ab8e2034a63f7530b568cc6f79", "parents": [ "2faa5fcdd1579d91dde3564a6749bf744490c31b" ], "author": { "name": "Tim Barron", "email": "tjbarron@google.com", "time": "Tue Oct 01 17:59:19 2024 +0000" }, "committer": { "name": "Tim Barron", "email": "tjbarron@google.com", "time": "Tue Oct 01 18:22:37 2024 +0000" }, "message": "Make the matching pattern for AppSearch broader.\n\nThe current pattern is 1) too narrow (it has missed APIs added in\nAndroid U and V that landed in T Extensions) and 2) mis-specified (the\npattern for addIndexableNestedProperties is incorrect).\n\nThis cl updates the pattern to simply be everything under the\nandroid.app.appsearch package.\n\nBug: 370777679\nFlag: DOCS_ONLY\nTest: m docs dist\nChange-Id: I3e384292ebccd9db897b8a39948d8d0a2d070c91\n" }, { "commit": "2faa5fcdd1579d91dde3564a6749bf744490c31b", "tree": "4ee432f31e6d63a53a64fe1439882b13ebc82fd6", "parents": [ "05c0f2f26392eaaf21e3f28545897c213de575a4", "a2904a9b2e8e7bfe80c66b2d63c294b036ef451c" ], "author": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Wed Sep 18 15:17:23 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 18 15:17:23 2024 +0000" }, "message": "sdk-extensions-info-test: graduate to presubmit am: ae53702d7f am: a2904a9b2e\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3271611\n\nChange-Id: Ibe5455a9bef470b57c39de4a2eda0e0977ceb0e6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a2904a9b2e8e7bfe80c66b2d63c294b036ef451c", "tree": "416f3229083a415eeca2af7b653018fc2abac6af", "parents": [ "0dd76bcf76eee6fcb22a3dc695efe95c101cfe71", "ae53702d7f960030cd05bb4525c0f57b7b5d181f" ], "author": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Wed Sep 18 14:58:58 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 18 14:58:58 2024 +0000" }, "message": "sdk-extensions-info-test: graduate to presubmit am: ae53702d7f\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3271611\n\nChange-Id: If74236f7bbd4c492a66cb9ad0e3a00c28bfcb495\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ae53702d7f960030cd05bb4525c0f57b7b5d181f", "tree": "416f3229083a415eeca2af7b653018fc2abac6af", "parents": [ "e3f0f871b20b505fe0aad2ed71afd1d4fa00d2e3" ], "author": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Wed Sep 18 11:55:30 2024 +0200" }, "committer": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Wed Sep 18 11:59:58 2024 +0200" }, "message": "sdk-extensions-info-test: graduate to presubmit\n\nThe sdk-extensions-info-test has proved itself in postsubmit long enough\nto graudate to presubmit. Move it to presubmit to make it more difficult\nto submit bad changes to sdk-extensions-info.xml.\n\nBug: 365536431\nTest: atest sdk-extensions-info-test\nFlag: EXEMPT unit test\nChange-Id: If788a0ff28485d539e2a6f55170b065f28595f9c\n" }, { "commit": "05c0f2f26392eaaf21e3f28545897c213de575a4", "tree": "babfad59cfe22112889233c5ea3c75aab0f98380", "parents": [ "b88c582a14941db702d63d7886447133c3dd0231" ], "author": { "name": "Roman Didukh", "email": "rdidukh@google.com", "time": "Wed Aug 14 11:43:59 2024 +0000" }, "committer": { "name": "Roman Didukh", "email": "rdidukh@google.com", "time": "Tue Sep 17 15:04:40 2024 +0000" }, "message": "[HealthFitness] Add Mindfulness data type to sdk extentions.\n\nIgnore-AOSP-First: Need to merge in main first as per discussion with\nsdk-extention team.\nFlag: com.android.healthfitness.flags.mindfulness\nBug: 341704006\nTest: m sdk dist\nChange-Id: I12fe43b3f2d6a1c291f9a0cd2f7243000ae648f1\n" }, { "commit": "b88c582a14941db702d63d7886447133c3dd0231", "tree": "a047e241a74928af091519abb48b2c1ccd0b19d9", "parents": [ "8794dcfeca37b2390b8ca1e24cdd09032ae77804", "0dd76bcf76eee6fcb22a3dc695efe95c101cfe71" ], "author": { "name": "Xiang Wang", "email": "xiangw@google.com", "time": "Wed Sep 11 18:30:21 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 11 18:30:21 2024 +0000" }, "message": "[automerger skipped] Enable secondary_user_on_secondary_display for CtsSdkExtensionsTestCases am: 2caca89e1f -s ours am: e3f0f871b2 -s ours am: 0dd76bcf76 -s ours\n\nam skip reason: Merged-In If8c232894a86282647d0beefa4692c9db23ff69e with SHA-1 9e4b1bdd4f is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3260818\n\nChange-Id: I2f951b432af4a5d443c8b56f645663407c70192c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0dd76bcf76eee6fcb22a3dc695efe95c101cfe71", "tree": "1a2734a33de77b87d19138e6893d8128e65a8ed1", "parents": [ "e3f82d95fb7f531106ef64fe90aab68d073c6123", "e3f0f871b20b505fe0aad2ed71afd1d4fa00d2e3" ], "author": { "name": "Xiang Wang", "email": "xiangw@google.com", "time": "Wed Sep 11 18:21:10 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 11 18:21:10 2024 +0000" }, "message": "[automerger skipped] Enable secondary_user_on_secondary_display for CtsSdkExtensionsTestCases am: 2caca89e1f -s ours am: e3f0f871b2 -s ours\n\nam skip reason: Merged-In If8c232894a86282647d0beefa4692c9db23ff69e with SHA-1 9e4b1bdd4f is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3260818\n\nChange-Id: Id75a835f2343481c7e4994f9acb6a46545542e87\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e3f0f871b20b505fe0aad2ed71afd1d4fa00d2e3", "tree": "1a2734a33de77b87d19138e6893d8128e65a8ed1", "parents": [ "ef6b3f1c31c23ecddcd8e31a3f5cf79ea00afc9b", "2caca89e1f6105240238227e16873623c7cef689" ], "author": { "name": "Xiang Wang", "email": "xiangw@google.com", "time": "Wed Sep 11 18:10:33 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 11 18:10:33 2024 +0000" }, "message": "[automerger skipped] Enable secondary_user_on_secondary_display for CtsSdkExtensionsTestCases am: 2caca89e1f -s ours\n\nam skip reason: Merged-In If8c232894a86282647d0beefa4692c9db23ff69e with SHA-1 9e4b1bdd4f is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3260818\n\nChange-Id: I9c3ac429a02a2c41cf058ed67db7b9d0027bc39d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2caca89e1f6105240238227e16873623c7cef689", "tree": "31823d08a5810abdc61fdca12fe01b24ce66303c", "parents": [ "6d940dbe8451bd9b23c55cb9b883fd03b5de7893" ], "author": { "name": "Xiang Wang", "email": "xiangw@google.com", "time": "Sat Aug 31 05:56:07 2024 +0000" }, "committer": { "name": "Xiang Wang", "email": "xiangw@google.com", "time": "Tue Sep 10 19:54:22 2024 +0000" }, "message": "Enable secondary_user_on_secondary_display for CtsSdkExtensionsTestCases\n\nsecondary_user_on_secondary_display is for background users that have\naccess to UI on assigned displays (a.k.a. visible background users) on devices that have config_multiuserVisibleBackgroundUsers enabled. The main use case is Automotive\u0027s multi-display Whole Cabin experience where\npassengers (modeled as visible background users) can interact with the display in front of them concurrently with the driver (modeled as the the current user) interacting with driver\u0027s display.\n\nBug: 363436052\nFlag: EXEMPT test fix\nTest: tested on gcar_md emu\nTest: atest --user-type secondary_user_on_secondary_display CtsSdkExtensionsTestCases\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e208658710115800e0428f5b770ee12793cd9b4d)\nChange-Id: If8c232894a86282647d0beefa4692c9db23ff69e\nMerged-In: If8c232894a86282647d0beefa4692c9db23ff69e\n(cherry picked from commit 9e4b1bdd4f4068d3699adff30bb0c26ab7c4225c)\n" }, { "commit": "8794dcfeca37b2390b8ca1e24cdd09032ae77804", "tree": "a047e241a74928af091519abb48b2c1ccd0b19d9", "parents": [ "88a415cee9d92c1c3f6020aa9a85ba7fd17a894e", "e3f82d95fb7f531106ef64fe90aab68d073c6123" ], "author": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Tue Sep 10 16:29:10 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 10 16:29:10 2024 +0000" }, "message": "Introduce sdk-extensions-info-test am: ef6b3f1c31 am: e3f82d95fb\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3259754\n\nChange-Id: I25e7e168f25f2a12dfd79b591d0e011cafd49625\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e3f82d95fb7f531106ef64fe90aab68d073c6123", "tree": "1a2734a33de77b87d19138e6893d8128e65a8ed1", "parents": [ "cfef55bf0199548e0a0cefd498cc5cc40d2022ec", "ef6b3f1c31c23ecddcd8e31a3f5cf79ea00afc9b" ], "author": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Tue Sep 10 16:20:05 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 10 16:20:05 2024 +0000" }, "message": "Introduce sdk-extensions-info-test am: ef6b3f1c31\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3259754\n\nChange-Id: I8971ef761dd4d29b221cae9d65c7ba679ffee679\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ef6b3f1c31c23ecddcd8e31a3f5cf79ea00afc9b", "tree": "1a2734a33de77b87d19138e6893d8128e65a8ed1", "parents": [ "e8a548b3f52d27c315332ed215c6ce8f20851372" ], "author": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Mon Sep 09 17:20:07 2024 +0200" }, "committer": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Tue Sep 10 16:54:13 2024 +0200" }, "message": "Introduce sdk-extensions-info-test\n\nAdd a new unit test to validate the contents of sdk-extensions-info.xml.\nThe test will eventually graduate to a presubmit test to help catch\nerrors in sdk-extensions-info.xml before it breaks the sdk and docs\nbuilds.\n\nBug: 365536431\nTest: atest sdk-extensions-info-test\nFlag: EXEMPT unit test\nChange-Id: I0a2c842078ead4af0ca3939ff34aaf0d8a5f21dd\n" }, { "commit": "88a415cee9d92c1c3f6020aa9a85ba7fd17a894e", "tree": "a40449c23089f520bb634c0d178ba1277921c0ca", "parents": [ "a2ec6cf4ed17728ef36d79f09cdefe221a1c92e8", "0981a6d3c51e9dae997dddec393cd9418cd813f7" ], "author": { "name": "Masha Khokhlova", "email": "mkhokhlova@google.com", "time": "Tue Sep 10 00:16:26 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 10 00:16:26 2024 +0000" }, "message": "Merge \"Bump SDK Extension version to 15\" into main" }, { "commit": "a2ec6cf4ed17728ef36d79f09cdefe221a1c92e8", "tree": "a37858989aa8320aae968ea54ea9a5ff5eedd849", "parents": [ "fbb0d37b5099a6ca1eb9140e6e95ec690022359c", "cfef55bf0199548e0a0cefd498cc5cc40d2022ec" ], "author": { "name": "bkchoi", "email": "bkchoi@google.com", "time": "Mon Sep 09 21:09:29 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 09 21:09:29 2024 +0000" }, "message": "[automerger skipped] Enable secondary_user_on_secondary_display for CtsClasspathsTestCases am: 6d940dbe84 -s ours am: e8a548b3f5 -s ours am: cfef55bf01 -s ours\n\nam skip reason: Merged-In Ie068c5e62f955cfe57c4d22f4f6c343c639af358 with SHA-1 cfe01c10ee is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3260815\n\nChange-Id: I610105416d131737570f836d5c1b1ae9ff16a9b1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "cfef55bf0199548e0a0cefd498cc5cc40d2022ec", "tree": "55975711a797aebc83b4e699625b940eeb1ba190", "parents": [ "20e33dbe79a105c18e6693f3b04ecf7524689811", "e8a548b3f52d27c315332ed215c6ce8f20851372" ], "author": { "name": "bkchoi", "email": "bkchoi@google.com", "time": "Mon Sep 09 21:00:05 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 09 21:00:05 2024 +0000" }, "message": "[automerger skipped] Enable secondary_user_on_secondary_display for CtsClasspathsTestCases am: 6d940dbe84 -s ours am: e8a548b3f5 -s ours\n\nam skip reason: Merged-In Ie068c5e62f955cfe57c4d22f4f6c343c639af358 with SHA-1 cfe01c10ee is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3260815\n\nChange-Id: Ic8caa6f6d62afe2be587e1e760d7e225e816019d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e8a548b3f52d27c315332ed215c6ce8f20851372", "tree": "55975711a797aebc83b4e699625b940eeb1ba190", "parents": [ "8d65706415a36967a9e26a8b72d25c7c9ef5e6f6", "6d940dbe8451bd9b23c55cb9b883fd03b5de7893" ], "author": { "name": "bkchoi", "email": "bkchoi@google.com", "time": "Mon Sep 09 20:48:51 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 09 20:48:51 2024 +0000" }, "message": "[automerger skipped] Enable secondary_user_on_secondary_display for CtsClasspathsTestCases am: 6d940dbe84 -s ours\n\nam skip reason: Merged-In Ie068c5e62f955cfe57c4d22f4f6c343c639af358 with SHA-1 cfe01c10ee is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3260815\n\nChange-Id: Ib968e7687fb0eaf6936198fc50f91ef5082ea268\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6d940dbe8451bd9b23c55cb9b883fd03b5de7893", "tree": "e59c1674cc8d0ac92ddb6157509251035b0bf44b", "parents": [ "abdacf26adf2359a448ee514a15f62acf136024d" ], "author": { "name": "bkchoi", "email": "bkchoi@google.com", "time": "Wed Sep 04 17:54:26 2024 +0000" }, "committer": { "name": "BK Choi", "email": "bkchoi@google.com", "time": "Mon Sep 09 20:10:44 2024 +0000" }, "message": "Enable secondary_user_on_secondary_display for CtsClasspathsTestCases\n\nsecondary_user_on_secondary_display is for background users that have\naccess to UI on assigned displays (a.k.a. visible background users) on\ndevices that have config_multiuserVisibleBackgroundUsers enabled. The\nmain use case is Automotive\u0027s multi-display Whole Cabin experience where\npassengers (modeled as visible background users) can interact with the\ndisplay in front of them concurrently with the driver (modeled as the\ncurrent user) interacting with driver\u0027s display.\n\nBug: 364631364\n\nTest: atest CtsClasspathsTestCases\nTest: atest --user-type secondary_user_on_secondary_display \\\n CtsClasspathsTestCases\n\n(cherry picked from https://android-review.googlesource.com/q/commit:cfe01c10ee9918c855194bf72f390ad4d8e3deb1)\nMerged-In: Ie068c5e62f955cfe57c4d22f4f6c343c639af358\nChange-Id: Ie068c5e62f955cfe57c4d22f4f6c343c639af358\n" }, { "commit": "fbb0d37b5099a6ca1eb9140e6e95ec690022359c", "tree": "a37858989aa8320aae968ea54ea9a5ff5eedd849", "parents": [ "fcdda6cdfd64260e3f10de3036953ed845c4a725", "20e33dbe79a105c18e6693f3b04ecf7524689811" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Sep 09 19:08:29 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 09 19:08:29 2024 +0000" }, "message": "Merge \"Enable secondary_user_on_secondary_display for CtsClasspathsTestCases\" into main am: 8d65706415 am: 20e33dbe79\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3255091\n\nChange-Id: I4b315de3790da2d6ea047f149c71734735a96c4b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "20e33dbe79a105c18e6693f3b04ecf7524689811", "tree": "55975711a797aebc83b4e699625b940eeb1ba190", "parents": [ "fc3d76da93b52fab471efe3c3476ecd8124f23f3", "8d65706415a36967a9e26a8b72d25c7c9ef5e6f6" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Sep 09 19:00:36 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 09 19:00:36 2024 +0000" }, "message": "Merge \"Enable secondary_user_on_secondary_display for CtsClasspathsTestCases\" into main am: 8d65706415\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3255091\n\nChange-Id: I53308e802de00ee3cb608c482c10423f774500d0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8d65706415a36967a9e26a8b72d25c7c9ef5e6f6", "tree": "55975711a797aebc83b4e699625b940eeb1ba190", "parents": [ "06b7a50b909d6be498fc42f69c4a03e11aacfa35", "cfe01c10ee9918c855194bf72f390ad4d8e3deb1" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Sep 09 18:55:44 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Sep 09 18:55:44 2024 +0000" }, "message": "Merge \"Enable secondary_user_on_secondary_display for CtsClasspathsTestCases\" into main" }, { "commit": "fcdda6cdfd64260e3f10de3036953ed845c4a725", "tree": "4ac603aac0e5568255146af46c5af624eba5eb3c", "parents": [ "b3c3bd3f37cf4892bf300197a1d3da2c2bfc6e92", "fc3d76da93b52fab471efe3c3476ecd8124f23f3" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Sep 07 02:37:50 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Sep 07 02:37:50 2024 +0000" }, "message": "[automerger skipped] Merge \"Merge 24Q3 to AOSP main\" into main am: 06b7a50b90 -s ours am: fc3d76da93 -s ours\n\nam skip reason: Merged-In I1fa6f339fd05b60eead04f0d3f1afee5880754e2 with SHA-1 1cac2eedec is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3257825\n\nChange-Id: Ib4758ed1afaa0b77e4d6782b0be0f9e478085251\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b3c3bd3f37cf4892bf300197a1d3da2c2bfc6e92", "tree": "4ac603aac0e5568255146af46c5af624eba5eb3c", "parents": [ "253ecfc8ba1450253c0dd754d9abda4a497faeec", "fe882310d69fcb178974cb3a0985b1ee829345a1" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Sep 07 02:37:48 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Sep 07 02:37:48 2024 +0000" }, "message": "[automerger skipped] Merge 24Q3 to AOSP main am: c3ee7b5345 -s ours am: fe882310d6 -s ours\n\nam skip reason: Merged-In I1fa6f339fd05b60eead04f0d3f1afee5880754e2 with SHA-1 1cac2eedec is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3257825\n\nChange-Id: I87772f3963c9322f3abf37466e9da573c33cb095\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "fc3d76da93b52fab471efe3c3476ecd8124f23f3", "tree": "14410f4cd42195361188bf71fef1be49f6041ff5", "parents": [ "fe882310d69fcb178974cb3a0985b1ee829345a1", "06b7a50b909d6be498fc42f69c4a03e11aacfa35" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Sep 07 02:03:25 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Sep 07 02:03:25 2024 +0000" }, "message": "[automerger skipped] Merge \"Merge 24Q3 to AOSP main\" into main am: 06b7a50b90 -s ours\n\nam skip reason: Merged-In I1fa6f339fd05b60eead04f0d3f1afee5880754e2 with SHA-1 1cac2eedec is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3257825\n\nChange-Id: I9efcb9eeec73ee9f0857b11c7b588562a7753435\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "fe882310d69fcb178974cb3a0985b1ee829345a1", "tree": "14410f4cd42195361188bf71fef1be49f6041ff5", "parents": [ "6dbb8212da759a2339069e58de8b4f6879cb19a2", "c3ee7b53455478d7757b61c8cc9be517e4f6c8bf" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Sep 07 02:03:22 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Sep 07 02:03:22 2024 +0000" }, "message": "[automerger skipped] Merge 24Q3 to AOSP main am: c3ee7b5345 -s ours\n\nam skip reason: Merged-In I1fa6f339fd05b60eead04f0d3f1afee5880754e2 with SHA-1 1cac2eedec is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3257825\n\nChange-Id: I39f69d3f24d7ea92c6846ad932bb627866958f10\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "06b7a50b909d6be498fc42f69c4a03e11aacfa35", "tree": "14410f4cd42195361188bf71fef1be49f6041ff5", "parents": [ "9e4b1bdd4f4068d3699adff30bb0c26ab7c4225c", "c3ee7b53455478d7757b61c8cc9be517e4f6c8bf" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Sep 07 01:10:50 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Sat Sep 07 01:10:50 2024 +0000" }, "message": "Merge \"Merge 24Q3 to AOSP main\" into main" }, { "commit": "0981a6d3c51e9dae997dddec393cd9418cd813f7", "tree": "1aab3084155f3c5d8f7ad97c17c99c26a86041b8", "parents": [ "253ecfc8ba1450253c0dd754d9abda4a497faeec" ], "author": { "name": "Mainline Sdk Release Releaser", "email": "mainline-sdk-release-releaser@prod.google.com", "time": "Sat Sep 07 00:48:55 2024 +0000" }, "committer": { "name": "Mainline Sdk Release Releaser", "email": "mainline-sdk-release-releaser@prod.google.com", "time": "Sat Sep 07 00:49:00 2024 +0000" }, "message": "Bump SDK Extension version to 15\n\nGenerated via Gantry with:\n$ packages/modules/SdkExtensions/gen_sdk/gen_sdk.py --database packages/modules/SdkExtensions/gen_sdk/extensions_db.textpb --action new_sdk --sdk 15 --modules AD_SERVICES,EXT_SERVICES,APPSEARCH,HEALTH_FITNESS,MEDIA_PROVIDER,ON_DEVICE_PERSONALIZATION,TETHERING\n\nDatabase update generated via Gantry with:\n$ gen_sdk --action new_sdk --sdk 15\n\nChange-Id: I81089460e05c0e503d5c37ba502800d3d987aa2a\nIgnore-AOSP-first: SDKs are finalized outside of AOSP\nFlag: EXEMPT SDK finalization is not flagged\nBug: 365182288\nTest: presubmit\n" }, { "commit": "253ecfc8ba1450253c0dd754d9abda4a497faeec", "tree": "4ac603aac0e5568255146af46c5af624eba5eb3c", "parents": [ "98b9692b364b2bcc06240ce84eb2fb786159df26", "6dbb8212da759a2339069e58de8b4f6879cb19a2" ], "author": { "name": "Xiang Wang", "email": "xiangw@google.com", "time": "Fri Sep 06 18:05:17 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 06 18:05:17 2024 +0000" }, "message": "Enable secondary_user_on_secondary_display for CtsSdkExtensionsTestCases am: 9e4b1bdd4f am: 6dbb8212da\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3251738\n\nChange-Id: I6d5091af3754f781ea009ba71592e1d819a1f99e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6dbb8212da759a2339069e58de8b4f6879cb19a2", "tree": "14410f4cd42195361188bf71fef1be49f6041ff5", "parents": [ "11780ea5c3732b7d5c39fa29117f4ba6f190f25c", "9e4b1bdd4f4068d3699adff30bb0c26ab7c4225c" ], "author": { "name": "Xiang Wang", "email": "xiangw@google.com", "time": "Fri Sep 06 17:40:41 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 06 17:40:41 2024 +0000" }, "message": "Enable secondary_user_on_secondary_display for CtsSdkExtensionsTestCases am: 9e4b1bdd4f\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3251738\n\nChange-Id: I76b995f5ce69b24a798d2833f140f3c676104233\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c3ee7b53455478d7757b61c8cc9be517e4f6c8bf", "tree": "f97b8ad207496ec87ef0e12c431cafbc2a0f1ed6", "parents": [ "165c0667c52f060dd1a0de22773feb2af76f84eb", "11780ea5c3732b7d5c39fa29117f4ba6f190f25c" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Sep 05 17:03:01 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Sep 05 17:03:01 2024 -0700" }, "message": "Merge 24Q3 to AOSP main\n\nBug: 357762254\nMerged-In: I1fa6f339fd05b60eead04f0d3f1afee5880754e2\nChange-Id: I47e6cf37cc3cddeb576569330653a92483b70983\n" }, { "commit": "cfe01c10ee9918c855194bf72f390ad4d8e3deb1", "tree": "d0f4ac1ae7e01dc8a08bc5d56417859ca1259866", "parents": [ "165c0667c52f060dd1a0de22773feb2af76f84eb" ], "author": { "name": "bkchoi", "email": "bkchoi@google.com", "time": "Wed Sep 04 17:54:26 2024 +0000" }, "committer": { "name": "BK Choi", "email": "bkchoi@google.com", "time": "Wed Sep 04 18:00:02 2024 +0000" }, "message": "Enable secondary_user_on_secondary_display for CtsClasspathsTestCases\n\nsecondary_user_on_secondary_display is for background users that have\naccess to UI on assigned displays (a.k.a. visible background users) on\ndevices that have config_multiuserVisibleBackgroundUsers enabled. The\nmain use case is Automotive\u0027s multi-display Whole Cabin experience where\npassengers (modeled as visible background users) can interact with the\ndisplay in front of them concurrently with the driver (modeled as the\ncurrent user) interacting with driver\u0027s display.\n\nBug: 364631364\n\nTest: atest CtsClasspathsTestCases\nTest: atest --user-type secondary_user_on_secondary_display \\\n CtsClasspathsTestCases\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:291a793c4fc1683ce17df00d2386b311e1cb86ab)\n\nChange-Id: Ie068c5e62f955cfe57c4d22f4f6c343c639af358\n" }, { "commit": "98b9692b364b2bcc06240ce84eb2fb786159df26", "tree": "95f2155b9c5eff893df550bbb889cb7adb617e40", "parents": [ "19fd60f8790b066af9d422fc838cb5aeff31b019", "144ecaebc0aa499b2941c361c92c47e85746e4a3" ], "author": { "name": "Ahmed Ibrahim", "email": "aibra@google.com", "time": "Wed Sep 04 13:06:07 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 04 13:06:07 2024 +0000" }, "message": "Merge \"[Embedded PhotoPicker] Enabling Embedded PhotoPicker APIs for sdk extension\" into main" }, { "commit": "144ecaebc0aa499b2941c361c92c47e85746e4a3", "tree": "5e1500554e11d497faffaf446603933d58410060", "parents": [ "8b129c2e537063993f2f890eb3c8b283788d5563" ], "author": { "name": "Shivam Garg", "email": "gargshivam@google.com", "time": "Sun Aug 18 19:26:31 2024 +0000" }, "committer": { "name": "Shivam Garg", "email": "gargshivam@google.com", "time": "Wed Sep 04 09:08:43 2024 +0000" }, "message": "[Embedded PhotoPicker] Enabling Embedded PhotoPicker APIs for sdk extension\n\nBug: 359468876\nTest: m sdk dist\nFlag: com.android.providers.media.flags.enable_embedded_photopicker\nIgnore-AOSP-First: CL expedited internally\nChange-Id: Ib582ea482d3068e1ede88cac1dd26c2d086204ae\n" }, { "commit": "9e4b1bdd4f4068d3699adff30bb0c26ab7c4225c", "tree": "975efb0a5f243c0a84650e010960377a13e90ccc", "parents": [ "165c0667c52f060dd1a0de22773feb2af76f84eb" ], "author": { "name": "Xiang Wang", "email": "xiangw@google.com", "time": "Sat Aug 31 05:56:07 2024 +0000" }, "committer": { "name": "Xiang Wang", "email": "xiangw@google.com", "time": "Tue Sep 03 17:50:09 2024 +0000" }, "message": "Enable secondary_user_on_secondary_display for CtsSdkExtensionsTestCases\n\nsecondary_user_on_secondary_display is for background users that have\naccess to UI on assigned displays (a.k.a. visible background users) on devices that have config_multiuserVisibleBackgroundUsers enabled. The main use case is Automotive\u0027s multi-display Whole Cabin experience where\npassengers (modeled as visible background users) can interact with the display in front of them concurrently with the driver (modeled as the the current user) interacting with driver\u0027s display.\n\nBug: 363436052\nFlag: EXEMPT test fix\nTest: tested on gcar_md emu\nTest: atest --user-type secondary_user_on_secondary_display CtsSdkExtensionsTestCases\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e208658710115800e0428f5b770ee12793cd9b4d)\nChange-Id: If8c232894a86282647d0beefa4692c9db23ff69e\n" }, { "commit": "19fd60f8790b066af9d422fc838cb5aeff31b019", "tree": "2f7dbf80d8cdb7cb35eee86dbdf3a3eb27db0e9b", "parents": [ "8b129c2e537063993f2f890eb3c8b283788d5563" ], "author": { "name": "Omar Eissa", "email": "oeissa@google.com", "time": "Mon Sep 02 14:48:39 2024 +0000" }, "committer": { "name": "Omar Eissa", "email": "oeissa@google.com", "time": "Mon Sep 02 16:20:07 2024 +0000" }, "message": "Add new symbols to SDK extensions info file for mediaprovider jar\n\nChange-Id: I3a5d5ea805b1d67675d052a06382af35005bb80f\nTest: n/a\nBug: 363991987\nIgnore-AOSP-First: n/a\nFlag: EXEMPT not applicable\n" }, { "commit": "8b129c2e537063993f2f890eb3c8b283788d5563", "tree": "23e326340107afbb0ab4d9a4dbf23d9367f751f3", "parents": [ "2151b6298d49068026b13f2d43159515c41df3fe", "11780ea5c3732b7d5c39fa29117f4ba6f190f25c" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Aug 30 18:27:40 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Aug 30 18:27:40 2024 +0000" }, "message": "Make java_sdk_library dependencies explicit am: 165c0667c5 am: 11780ea5c3\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3250854\n\nChange-Id: I2ffeb215a96d23823e56dbc2ca8e57300b572268\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "11780ea5c3732b7d5c39fa29117f4ba6f190f25c", "tree": "f97b8ad207496ec87ef0e12c431cafbc2a0f1ed6", "parents": [ "0e02cdfb76cbc2f9add95482629487151cbc55f5", "165c0667c52f060dd1a0de22773feb2af76f84eb" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Aug 30 18:18:09 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Aug 30 18:18:09 2024 +0000" }, "message": "Make java_sdk_library dependencies explicit am: 165c0667c5\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3250854\n\nChange-Id: Iee7ec11d480880351ad22da0062d6f1e5ae04db0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "165c0667c52f060dd1a0de22773feb2af76f84eb", "tree": "028e2b870b5aeb0306d4211fae17f63e1abdd635", "parents": [ "57864c96bedb060b9db7fd15de0dbf01e5bd1a6b" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Aug 30 00:30:11 2024 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Aug 30 00:30:11 2024 +0000" }, "message": "Make java_sdk_library dependencies explicit\n\nmodules should specify the submodule of java_sdk_library that the module\nactually depends on\n\nTest: CI\nBug: 358613520\nChange-Id: I1b1feb94ccd031e671ef8c7d60266916f04dbb3e\n" }, { "commit": "2151b6298d49068026b13f2d43159515c41df3fe", "tree": "4d7a8c27cae2d2ab6abab655d7f98011d0c0dfdc", "parents": [ "cb1ffda142b088bd74d51304b82ab0ba84ccdd8a", "0e02cdfb76cbc2f9add95482629487151cbc55f5" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Aug 29 06:41:12 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 29 06:41:12 2024 +0000" }, "message": "[automerger skipped] Merge \"SdkExtensionsTest: allow newer (unknown) versions\" into aosp-24Q3-ts-dev am: abdacf26ad -s ours am: 0e02cdfb76 -s ours\n\nam skip reason: Merged-In I1fa6f339fd05b60eead04f0d3f1afee5880754e2 with SHA-1 1cac2eedec is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/29025578\n\nChange-Id: I6d42d0703c84108caef936e30510678517287166\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "cb1ffda142b088bd74d51304b82ab0ba84ccdd8a", "tree": "4d7a8c27cae2d2ab6abab655d7f98011d0c0dfdc", "parents": [ "2a6840b016d36ac5927c82bda3f2f821ebbfca80", "323dfd91e91faafbd33e1cdcf2538e331f86843f" ], "author": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Thu Aug 29 06:41:09 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 29 06:41:09 2024 +0000" }, "message": "[automerger skipped] SdkExtensionsTest: allow newer (unknown) versions am: 46d50eea70 -s ours am: 323dfd91e9 -s ours\n\nam skip reason: Merged-In I1fa6f339fd05b60eead04f0d3f1afee5880754e2 with SHA-1 1cac2eedec is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/29025578\n\nChange-Id: I2d83fcad73745961bc32b67b3ed33ece148a4251\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0e02cdfb76cbc2f9add95482629487151cbc55f5", "tree": "181ebac720dc5fb866eb007c8a7e25ca47df1092", "parents": [ "323dfd91e91faafbd33e1cdcf2538e331f86843f", "abdacf26adf2359a448ee514a15f62acf136024d" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Aug 29 06:32:05 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 29 06:32:05 2024 +0000" }, "message": "[automerger skipped] Merge \"SdkExtensionsTest: allow newer (unknown) versions\" into aosp-24Q3-ts-dev am: abdacf26ad -s ours\n\nam skip reason: Merged-In I1fa6f339fd05b60eead04f0d3f1afee5880754e2 with SHA-1 1cac2eedec is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/29025578\n\nChange-Id: I0f3d4efda8dcbed2aac05231b4c62f0b20db09be\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "323dfd91e91faafbd33e1cdcf2538e331f86843f", "tree": "181ebac720dc5fb866eb007c8a7e25ca47df1092", "parents": [ "0cf474b2cec31c9c1b33b19efc47784c261791de", "46d50eea70af53583f6ea80145683af49436cafe" ], "author": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Thu Aug 29 06:31:59 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 29 06:31:59 2024 +0000" }, "message": "[automerger skipped] SdkExtensionsTest: allow newer (unknown) versions am: 46d50eea70 -s ours\n\nam skip reason: Merged-In I1fa6f339fd05b60eead04f0d3f1afee5880754e2 with SHA-1 1cac2eedec is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/29025578\n\nChange-Id: Iefede322729b8c36a8ae9f07a3643c5e4ad952ef\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "abdacf26adf2359a448ee514a15f62acf136024d", "tree": "e0dc8192eee51439e2773018a581661cecf49702", "parents": [ "387c501be320a28f2d67b51bc54d24a807f0926f", "46d50eea70af53583f6ea80145683af49436cafe" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Aug 29 06:25:33 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 29 06:25:33 2024 +0000" }, "message": "Merge \"SdkExtensionsTest: allow newer (unknown) versions\" into aosp-24Q3-ts-dev" }, { "commit": "2a6840b016d36ac5927c82bda3f2f821ebbfca80", "tree": "4d7a8c27cae2d2ab6abab655d7f98011d0c0dfdc", "parents": [ "f2add220958aff3132bec9cbd29c92207c7ef4b7", "de01ad5804138002d4381bf16513d92bf7ade357" ], "author": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Wed Aug 28 19:38:44 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 28 19:38:44 2024 +0000" }, "message": "[automerger skipped] DO NOT MERGE SdkExtensionsTest: allow newer (unknown) versions am: 14e764382b -s ours am: f3beca9354 -s ours am: 2d9cc64072 -s ours am: 2bc5c73254 -s ours am: 48b5d8b221 -s ours am: 8d246e67d3 -s ours am: 57c87d0519 -s ours am: de01ad5804 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3247211\n\nChange-Id: I4ba57e3814d5ae0134739437cda4646769db926d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f2add220958aff3132bec9cbd29c92207c7ef4b7", "tree": "4d7a8c27cae2d2ab6abab655d7f98011d0c0dfdc", "parents": [ "5063a3b5d02e5548ded6d3c86f7ac4b971458078", "93d95d7645c9e0486452524c336a31c373ec3371" ], "author": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Wed Aug 28 19:38:30 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 28 19:38:30 2024 +0000" }, "message": "[automerger skipped] DO NOT MERGE SdkExtensionsTest: allow newer (unknown) versions am: 4c8b385f31 -s ours am: 3882b9becf -s ours am: 2355b6acb3 -s ours am: b067babce1 -s ours am: 4369df6710 -s ours am: d3d7715ec9 -s ours am: 93d95d7645 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3247212\n\nChange-Id: Iccdbb9ecf6e37bb4767ff5e4ad6b7bcc2e1c1ca9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5063a3b5d02e5548ded6d3c86f7ac4b971458078", "tree": "4d7a8c27cae2d2ab6abab655d7f98011d0c0dfdc", "parents": [ "e816bd86d155bf43aac40cdcbc2d97f1b3699c2c", "f52dd4b44c08ba81cdf07305f478041ced88afec" ], "author": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Wed Aug 28 19:38:15 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 28 19:38:15 2024 +0000" }, "message": "[automerger skipped] DO NOT MERGE SdkExtensionsTest: allow newer (unknown) versions am: b5c9e4c5a2 am: 344a1f0bf0 -s ours am: d4aba60c6d -s ours am: 32c1ad6403 -s ours am: 380a9d9e58 -s ours am: f52dd4b44c -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3244403\n\nChange-Id: I059741e5caef8ded11fe218b92529e8eb758864b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e816bd86d155bf43aac40cdcbc2d97f1b3699c2c", "tree": "4d7a8c27cae2d2ab6abab655d7f98011d0c0dfdc", "parents": [ "a71798ba83a3d59704390f0f6e760c6d2e5ca191", "a7a3b190df9d8d9a51aab520c089aae7a1dbddf8" ], "author": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Wed Aug 28 19:29:39 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 28 19:29:39 2024 +0000" }, "message": "[automerger skipped] DO NOT MERGE SdkExtensionsTest: allow newer (unknown) versions am: 14e764382b -s ours am: f3beca9354 -s ours am: 2d9cc64072 -s ours am: 2bc5c73254 -s ours am: 48b5d8b221 -s ours am: 8d246e67d3 -s ours am: a7a3b190df -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3247211\n\nChange-Id: Ic453ca5cb2c765d91be38e6eb749165dc4fcbd62\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "de01ad5804138002d4381bf16513d92bf7ade357", "tree": "0222c1049e345d5d8070c668ad8e446ab1971f2e", "parents": [ "93d95d7645c9e0486452524c336a31c373ec3371", "57c87d05193eeaf8dae7e299d6411363e78ddfd6" ], "author": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Wed Aug 28 19:29:35 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 28 19:29:35 2024 +0000" }, "message": "[automerger skipped] DO NOT MERGE SdkExtensionsTest: allow newer (unknown) versions am: 14e764382b -s ours am: f3beca9354 -s ours am: 2d9cc64072 -s ours am: 2bc5c73254 -s ours am: 48b5d8b221 -s ours am: 8d246e67d3 -s ours am: 57c87d0519 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3247211\n\nChange-Id: I9004a9517bcada12a06b2b85a34f48582b95d8e3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a71798ba83a3d59704390f0f6e760c6d2e5ca191", "tree": "4d7a8c27cae2d2ab6abab655d7f98011d0c0dfdc", "parents": [ "51b4f732767f1355b794c732b3c0d27fa468be2b", "8c9ecbd8d49de19902efe1ca197c155ad53c57ad" ], "author": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Wed Aug 28 19:29:25 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 28 19:29:25 2024 +0000" }, "message": "[automerger skipped] DO NOT MERGE SdkExtensionsTest: allow newer (unknown) versions am: 4c8b385f31 -s ours am: 3882b9becf -s ours am: 2355b6acb3 -s ours am: b067babce1 -s ours am: 4369df6710 -s ours am: 8c9ecbd8d4 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3247212\n\nChange-Id: I49f3c81a1eab8909e28b40f18cff20fdeae7cd23\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "51b4f732767f1355b794c732b3c0d27fa468be2b", "tree": "4d7a8c27cae2d2ab6abab655d7f98011d0c0dfdc", "parents": [ "53d429f71dafae7f43aeb3fe70db1f485428d219", "d5c347a31229ee21a9087d5ef854b12264d85f4c" ], "author": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Wed Aug 28 19:29:11 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 28 19:29:11 2024 +0000" }, "message": "[automerger skipped] DO NOT MERGE SdkExtensionsTest: allow newer (unknown) versions am: b5c9e4c5a2 am: 344a1f0bf0 -s ours am: d4aba60c6d -s ours am: 32c1ad6403 -s ours am: d5c347a312 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3244403\n\nChange-Id: I681eb4548e66c36a89436e4d7c1ae23d242dc3e1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "93d95d7645c9e0486452524c336a31c373ec3371", "tree": "0222c1049e345d5d8070c668ad8e446ab1971f2e", "parents": [ "f52dd4b44c08ba81cdf07305f478041ced88afec", "d3d7715ec92f9b75149b7e9c750c701364cbc169" ], "author": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Wed Aug 28 19:29:08 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 28 19:29:08 2024 +0000" }, "message": "[automerger skipped] DO NOT MERGE SdkExtensionsTest: allow newer (unknown) versions am: 4c8b385f31 -s ours am: 3882b9becf -s ours am: 2355b6acb3 -s ours am: b067babce1 -s ours am: 4369df6710 -s ours am: d3d7715ec9 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3247212\n\nChange-Id: I82f9b3ab111306bcab261e5d068022ce83a75bf6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f52dd4b44c08ba81cdf07305f478041ced88afec", "tree": "0222c1049e345d5d8070c668ad8e446ab1971f2e", "parents": [ "002431264cd34f90232adf3925ca9de34a0c1150", "380a9d9e58211215171792443cdfdfdf88d6d02d" ], "author": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Wed Aug 28 19:28:33 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 28 19:28:33 2024 +0000" }, "message": "[automerger skipped] DO NOT MERGE SdkExtensionsTest: allow newer (unknown) versions am: b5c9e4c5a2 am: 344a1f0bf0 -s ours am: d4aba60c6d -s ours am: 32c1ad6403 -s ours am: 380a9d9e58 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3244403\n\nChange-Id: I0244bd6447613a6e2675521dae6e8941887fdf6e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "57c87d05193eeaf8dae7e299d6411363e78ddfd6", "tree": "0222c1049e345d5d8070c668ad8e446ab1971f2e", "parents": [ "d3d7715ec92f9b75149b7e9c750c701364cbc169", "8d246e67d38e4063f2f847217ff9934dc46121bc" ], "author": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Wed Aug 28 19:20:51 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 28 19:20:51 2024 +0000" }, "message": "[automerger skipped] DO NOT MERGE SdkExtensionsTest: allow newer (unknown) versions am: 14e764382b -s ours am: f3beca9354 -s ours am: 2d9cc64072 -s ours am: 2bc5c73254 -s ours am: 48b5d8b221 -s ours am: 8d246e67d3 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3247211\n\nChange-Id: I471cba7f3ea858a285b0fb423cf3f918b341d809\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a7a3b190df9d8d9a51aab520c089aae7a1dbddf8", "tree": "54f5f7b200dbfab4d0693eacbcb57075088d9b24", "parents": [ "8c9ecbd8d49de19902efe1ca197c155ad53c57ad", "8d246e67d38e4063f2f847217ff9934dc46121bc" ], "author": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Wed Aug 28 19:20:32 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 28 19:20:32 2024 +0000" }, "message": "[automerger skipped] DO NOT MERGE SdkExtensionsTest: allow newer (unknown) versions am: 14e764382b -s ours am: f3beca9354 -s ours am: 2d9cc64072 -s ours am: 2bc5c73254 -s ours am: 48b5d8b221 -s ours am: 8d246e67d3 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3247211\n\nChange-Id: I6073dc2138b014e1ff0edbe50a4f4515f82da8a9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d3d7715ec92f9b75149b7e9c750c701364cbc169", "tree": "0222c1049e345d5d8070c668ad8e446ab1971f2e", "parents": [ "380a9d9e58211215171792443cdfdfdf88d6d02d", "4369df671003c12b7e46fb37e8a8579f3716704e" ], "author": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Wed Aug 28 19:20:24 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 28 19:20:24 2024 +0000" }, "message": "[automerger skipped] DO NOT MERGE SdkExtensionsTest: allow newer (unknown) versions am: 4c8b385f31 -s ours am: 3882b9becf -s ours am: 2355b6acb3 -s ours am: b067babce1 -s ours am: 4369df6710 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/3247212\n\nChange-Id: I6eab2b4a7dbf17f1a85e22daaa5daedb3e853c41\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" } ], "next": "8c9ecbd8d49de19902efe1ca197c155ad53c57ad" }