summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-12-05Snap for 11180127 from 05dcb2cb5181c8324e1233cd37efbc04d9035538 to ↵aml_mpr_341411070android14-mainline-mediaprovider-releaseAndroid Build Coastguard Worker
mainline-mediaprovider-release Change-Id: I1d381f4a72170071ed9f220eb6c5f6ca6681b664
2023-12-05[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-2ea35ff4f32343c1829bd31e542daefd" into android13-tests-dev am: fd97e4b299 am: 3be50a73c3 am: 0386a50966 am: fc4e6fe123 -s ours am: cb8fd267c7 -s ours am skip reason: Merged-In I61974e9d5aa3a864836dcc01c3ee311a14449805 with SHA-1 8e8c337a28 is already in history Original change: https://android-review.googlesource.com/c/platform/cts/+/2847393 Change-Id: I630518490c4f006c3d3f92ec363c354bf60d66c8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Merge "DO NOT MERGE Check form factors in ↵Treehugger Robot
DownloadManagerTest" into android12-tests-dev am: bd2c6e58f2 -s ours am: e7e91a3586 -s ours am: be24290fcb -s ours am: bad1aac810 -s ours am: ec8c962a05 -s ours am: ab0feff58a -s ours am: 83b676162f -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/2847393 Change-Id: I15182df846d153fb4a0228da77595203c1ad96a5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-2ea35ff4f32343c1829bd31e542daefd" into android13-tests-dev am: fd97e4b299 am: 3be50a73c3 am: 0386a50966 am: fc4e6fe123 -s ours am skip reason: Merged-In I61974e9d5aa3a864836dcc01c3ee311a14449805 with SHA-1 8e8c337a28 is already in history Original change: https://android-review.googlesource.com/c/platform/cts/+/2847393 Change-Id: I3ef21de56cef5eee84e5f438090154a6e09b5bf8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Merge "DO NOT MERGE Check form factors in ↵Treehugger Robot
DownloadManagerTest" into android12-tests-dev am: bd2c6e58f2 -s ours am: e7e91a3586 -s ours am: be24290fcb -s ours am: bad1aac810 -s ours am: ec8c962a05 -s ours am: ab0feff58a -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/2847393 Change-Id: Iaca507ca471d342618673a022dc7fbefb799d4f1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-2ea35ff4f32343c1829bd31e542daefd" into android13-tests-dev am: fd97e4b299 am: 3be50a73c3 am: 5f9893e9b4 -s ours am: 9373f5b8c8 -s ours am skip reason: Merged-In I61974e9d5aa3a864836dcc01c3ee311a14449805 with SHA-1 8e8c337a28 is already in history Original change: https://android-review.googlesource.com/c/platform/cts/+/2847393 Change-Id: Ifcccf9a3115b8c853327a9aca002668ff98c9cee Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Merge "DO NOT MERGE Check form factors in ↵Treehugger Robot
DownloadManagerTest" into android12-tests-dev am: bd2c6e58f2 -s ours am: e7e91a3586 -s ours am: be24290fcb -s ours am: bad1aac810 -s ours am: 99898be39d -s ours am: 2bf7f35331 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/2847393 Change-Id: Iddb65f6a1e895f27522ea6562b8e0efffa1c8002 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-2ea35ff4f32343c1829bd31e542daefd" into android13-tests-dev am: fd97e4b299 am: 3be50a73c3 am: 5f9893e9b4 -s ours am skip reason: Merged-In I61974e9d5aa3a864836dcc01c3ee311a14449805 with SHA-1 8e8c337a28 is already in history Original change: https://android-review.googlesource.com/c/platform/cts/+/2847393 Change-Id: Ie2a4a1f26b0cdb821e9921faaee0b6e806c6c982 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Merge "DO NOT MERGE Check form factors in ↵Treehugger Robot
DownloadManagerTest" into android12-tests-dev am: bd2c6e58f2 -s ours am: e7e91a3586 -s ours am: be24290fcb -s ours am: bad1aac810 -s ours am: 99898be39d -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/2847393 Change-Id: I9639e054a299c357b1f9d4ce19c38a31e7bc6c0d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-e2aefce55ef5461fb1f17ab0e6f33602" into android14-tests-dev am: 35ded15b81 -s ours am: 3dd3a681e2 -s ours am skip reason: Merged-In I61974e9d5aa3a864836dcc01c3ee311a14449805 with SHA-1 8e8c337a28 is already in history Original change: https://android-review.googlesource.com/c/platform/cts/+/2847393 Change-Id: I81b065bb6ddc9201a6e8361a4265227cd1d42b77 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-2ea35ff4f32343c1829bd31e542daefd" into android13-tests-dev am: fd97e4b299 -s ours am: b0f088cb1f -s ours am: f463e42f68 -s ours am skip reason: Merged-In I61974e9d5aa3a864836dcc01c3ee311a14449805 with SHA-1 8e8c337a28 is already in history Original change: https://android-review.googlesource.com/c/platform/cts/+/2847393 Change-Id: Ie88e68d40b857a13d3a12ca38848705d8747a255 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Merge changes from topic "am-2ea35ff4f32343c1829bd31e542daefd" into ↵Automerger Merge Worker
android13-tests-dev am: fd97e4b299 am: 3be50a73c3 am: 0386a50966 Original change: https://android-review.googlesource.com/c/platform/cts/+/2847393 Change-Id: I0e8312c0bc0ad01791afd7e9e1a799f10ba3a09a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Merge "DO NOT MERGE Check form factors in ↵Treehugger Robot
DownloadManagerTest" into android12-tests-dev am: bd2c6e58f2 -s ours am: e7e91a3586 -s ours am: be24290fcb -s ours am: bad1aac810 -s ours am: ec8c962a05 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/2847393 Change-Id: Ibf6e1b8c236a75c11602fbd8681ca80c296f25e1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Merge changes from topic "am-e2aefce55ef5461fb1f17ab0e6f33602" into ↵Automerger Merge Worker
android14-tests-dev am: 35ded15b81 -s ours am skip reason: Merged-In I61974e9d5aa3a864836dcc01c3ee311a14449805 with SHA-1 8e8c337a28 is already in history Original change: https://android-review.googlesource.com/c/platform/cts/+/2847393 Change-Id: If1348e7de69106736a949f45a1f13ad685efd443 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-2ea35ff4f32343c1829bd31e542daefd" into android13-tests-dev am: fd97e4b299 -s ours am: b0f088cb1f -s ours am skip reason: Merged-In I61974e9d5aa3a864836dcc01c3ee311a14449805 with SHA-1 8e8c337a28 is already in history Original change: https://android-review.googlesource.com/c/platform/cts/+/2847393 Change-Id: I980231cf138072cebbe6ddae05b8d15d948b738c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Merge changes from topic "am-2ea35ff4f32343c1829bd31e542daefd" into ↵Automerger Merge Worker
android13-tests-dev am: fd97e4b299 am: 3be50a73c3 Original change: https://android-review.googlesource.com/c/platform/cts/+/2847393 Change-Id: I3ffb564b815fb58c2906a2d0bce56e93a8fbb1f0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Merge "DO NOT MERGE Check form factors in ↵Treehugger Robot
DownloadManagerTest" into android12-tests-dev am: bd2c6e58f2 -s ours am: e7e91a3586 -s ours am: be24290fcb -s ours am: bad1aac810 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/2847393 Change-Id: I3115a9d0809dc7d438bde72395c154cf324fdfe0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Merge changes from topic "am-2ea35ff4f32343c1829bd31e542daefd" into ↵Automerger Merge Worker
android13-tests-dev am: fd97e4b299 am: 3be50a73c3 Original change: https://android-review.googlesource.com/c/platform/cts/+/2847393 Change-Id: I1f750d0d4ee8257cd9a7a3ecd31a54f809b74383 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Merge "DO NOT MERGE Check form factors in ↵Treehugger Robot
DownloadManagerTest" into android12-tests-dev am: bd2c6e58f2 -s ours am: e7e91a3586 -s ours am: be24290fcb -s ours am: bad1aac810 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/2847393 Change-Id: Ie59d230d72955c3f68486d78d5df6424dd171a55 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Merge "RESTRICT AUTOMERGE: Fix ↵Rachit Jain
android.server.wm.DisplayHashManagerTest#testGenerateAndVerifyDisplayHash_MultiColor" into android14-tests-dev am: 807c06bcd4 am: 0c0e17969f Original change: https://android-review.googlesource.com/c/platform/cts/+/2854728 Change-Id: Ife3bea556758007115ecc32e8b6d6d333e20afb5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05RESTRICT AUTOMERGE: Fix ↵Rachit Jain
android.server.wm.DisplayHashManagerTest#testGenerateAndVerifyDisplayHash_MultiColor am: 66677f9953 am: e4c4e6b4c1 Original change: https://android-review.googlesource.com/c/platform/cts/+/2854728 Change-Id: Ibcc03c0ad2dbc2b340bca7dc72569524b3a3fa50 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Merge "Re-add missing info model year test" into android14-tests-dev am: ↵Aaqib Ismail
3f21b83f20 am: e13549c0b8 Original change: https://android-review.googlesource.com/c/platform/cts/+/2849798 Change-Id: I15060c090621ebf4ecf0374cb0b121255b92c75c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Merge "Fix incorrect permissions for HANDS_ON_DETECTION_ENABLED" into ↵Aaqib Ismail
android14-tests-dev am: 5d3fafd925 am: e45ad96dcd Original change: https://android-review.googlesource.com/c/platform/cts/+/2849797 Change-Id: Ice80a4a669004e23ea6478a085be5a41ad499e2e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Merge changes from topic "am-e2aefce55ef5461fb1f17ab0e6f33602" into ↵Automerger Merge Worker
android14-tests-dev * changes: Merge changes from topic "am-2ea35ff4f32343c1829bd31e542daefd" into android13-tests-dev am: fd97e4b299 -s ours [automerger skipped] Merge changes from topic "am-53f2f09fe9d942c0bf359ef44ae4c208" into android12L-tests-dev am: 295c55bd97 am: 23c6b3d917 -s ours
2023-12-05Merge "Fix missing rounding and incorrect float to int conversions" into ↵Aaqib Ismail
android14-tests-dev am: 86a35e1427 am: eb79fe3175 Original change: https://android-review.googlesource.com/c/platform/cts/+/2855472 Change-Id: I88b7b465566644f39362a55e9f2fe646b6754ee3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Merge changes from topic "am-2ea35ff4f32343c1829bd31e542daefd" into ↵Automerger Merge Worker
android13-tests-dev am: fd97e4b299 -s ours am skip reason: Merged-In I61974e9d5aa3a864836dcc01c3ee311a14449805 with SHA-1 8e8c337a28 is already in history Original change: https://android-review.googlesource.com/c/platform/cts/+/2847393 Change-Id: I2e71d39fb1f0b693faf35456fe06c1f9c7354a73 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-53f2f09fe9d942c0bf359ef44ae4c208" into android12L-tests-dev am: 295c55bd97 am: 23c6b3d917 -s ours am skip reason: Merged-In I61974e9d5aa3a864836dcc01c3ee311a14449805 with SHA-1 8e8c337a28 is already in history Original change: https://android-review.googlesource.com/c/platform/cts/+/2847393 Change-Id: I15d2250d3d02c135c95cacf77ae5225c0f062651 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Merge "Enlarge android.signature.cts.api.system_annotation timeout" into ↵Treehugger Robot
android14-tests-dev am: 80e3cd4ccd am: 4b8a9703a0 Original change: https://android-review.googlesource.com/c/platform/cts/+/2853678 Change-Id: Ic1f3286028927cdab0ccdb289c3a563daee51cfe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Merge changes from topic "am-2ea35ff4f32343c1829bd31e542daefd" into ↵Automerger Merge Worker
android13-tests-dev am: fd97e4b299 Original change: https://android-review.googlesource.com/c/platform/cts/+/2847393 Change-Id: I0ff4b03904cb1c76aa7c231f1b04ee8ee1d91e07 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Merge "DO NOT MERGE Check form factors in ↵Treehugger Robot
DownloadManagerTest" into android12-tests-dev am: bd2c6e58f2 -s ours am: e7e91a3586 -s ours am: be24290fcb -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/2847393 Change-Id: I51ed54a4800844a10bac9b6811dbf66da2259076 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Merge "RESTRICT AUTOMERGE: Fix ↵Rachit Jain
android.server.wm.DisplayHashManagerTest#testGenerateAndVerifyDisplayHash_MultiColor" into android14-tests-dev am: 807c06bcd4 Original change: https://android-review.googlesource.com/c/platform/cts/+/2854728 Change-Id: I7802bdec70b4f7368c513407e736ed7a685846df Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05RESTRICT AUTOMERGE: Fix ↵Rachit Jain
android.server.wm.DisplayHashManagerTest#testGenerateAndVerifyDisplayHash_MultiColor am: 66677f9953 Original change: https://android-review.googlesource.com/c/platform/cts/+/2854728 Change-Id: I183e7e0826719b36467ea32eae02c4bbac69b0e1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Merge "Re-add missing info model year test" into android14-tests-dev am: ↵Aaqib Ismail
3f21b83f20 Original change: https://android-review.googlesource.com/c/platform/cts/+/2849798 Change-Id: Idec91ca19e11efc867e2652a20c2f2cf45280f41 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Merge "Fix incorrect permissions for HANDS_ON_DETECTION_ENABLED" into ↵Aaqib Ismail
android14-tests-dev am: 5d3fafd925 Original change: https://android-review.googlesource.com/c/platform/cts/+/2849797 Change-Id: Ie2ea72406f39201450c070c88bedc176f6e9f0cb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Merge "Fix missing rounding and incorrect float to int conversions" into ↵Aaqib Ismail
android14-tests-dev am: 86a35e1427 Original change: https://android-review.googlesource.com/c/platform/cts/+/2855472 Change-Id: I9a9d4206aca52c9afcd9c7f79028ce1a48ada730 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Merge "Enlarge android.signature.cts.api.system_annotation timeout" into ↵Treehugger Robot
android14-tests-dev am: 80e3cd4ccd Original change: https://android-review.googlesource.com/c/platform/cts/+/2853678 Change-Id: I69233311159507f304a3565c0f2517cdb7e9a596 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Merge changes from topic "am-2ea35ff4f32343c1829bd31e542daefd" into ↵Automerger Merge Worker
android13-tests-dev * changes: Merge changes from topic "am-53f2f09fe9d942c0bf359ef44ae4c208" into android12L-tests-dev am: 295c55bd97 [automerger skipped] Merge "DO NOT MERGE Check form factors in DownloadManagerTest" into android12-tests-dev am: bd2c6e58f2 -s ours am: e7e91a3586 -s ours
2023-12-05Merge changes from topic "am-53f2f09fe9d942c0bf359ef44ae4c208" into ↵Automerger Merge Worker
android12L-tests-dev am: 295c55bd97 Original change: https://android-review.googlesource.com/c/platform/cts/+/2847393 Change-Id: I17a9c8ac4a1795f1a6973ca8e37c204baad52b15 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Merge "DO NOT MERGE Check form factors in ↵Treehugger Robot
DownloadManagerTest" into android12-tests-dev am: bd2c6e58f2 -s ours am: e7e91a3586 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/2847393 Change-Id: I222703c026b7c8b3462fb82404d56015c35cedbd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Merge "RESTRICT AUTOMERGE: Fix ↵Rachit Jain
android.server.wm.DisplayHashManagerTest#testGenerateAndVerifyDisplayHash_MultiColor" into android14-tests-dev
2023-12-05Merge "Re-add missing info model year test" into android14-tests-devAaqib Ismail
2023-12-05Merge "Fix incorrect permissions for HANDS_ON_DETECTION_ENABLED" into ↵Aaqib Ismail
android14-tests-dev
2023-12-05Merge "Fix missing rounding and incorrect float to int conversions" into ↵Aaqib Ismail
android14-tests-dev
2023-12-05Merge "Enlarge android.signature.cts.api.system_annotation timeout" into ↵Treehugger Robot
android14-tests-dev
2023-12-05Merge changes from topic "am-53f2f09fe9d942c0bf359ef44ae4c208" into ↵Automerger Merge Worker
android12L-tests-dev * changes: [automerger skipped] Merge "DO NOT MERGE Check form factors in DownloadManagerTest" into android12-tests-dev am: bd2c6e58f2 -s ours [automerger skipped] DO NOT MERGE am: e73fea1b38 -s ours
2023-12-05[automerger skipped] Merge "DO NOT MERGE Check form factors in ↵Treehugger Robot
DownloadManagerTest" into android12-tests-dev am: bd2c6e58f2 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/2847393 Change-Id: I2f048ff6d034115f25010951744f9a30cd27b445 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] DO NOT MERGE am: e73fea1b38 -s oursSergey Nikolaienkov
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/2847393 Change-Id: I83cef2eb4f2c0a4229c1a2d3fd4729b1b3af04cd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Merge "DO NOT MERGE Check form factors in DownloadManagerTest" into ↵Treehugger Robot
android12-tests-dev
2023-12-05Merge "Make MODIFY_DAY_NIGHT_MODE and OBSERVE_APP_USAGE permissions ↵Richard MacGregor
grantable via role." into android14-tests-dev am: 2c813de472 am: d647e5bb7f Original change: https://android-review.googlesource.com/c/platform/cts/+/2852818 Change-Id: Ifb01d8d2b60612333b7015cf04cc52f07be01e89 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04Merge "Make MODIFY_DAY_NIGHT_MODE and OBSERVE_APP_USAGE permissions ↵Richard MacGregor
grantable via role." into android14-tests-dev am: 2c813de472 Original change: https://android-review.googlesource.com/c/platform/cts/+/2852818 Change-Id: I372244ea73078815ecf2c9698b2e1a79849097dd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>