summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-12-02Merge "Merge empty history for sparse-7907387-L00500000952137325" into ↵sparse_historyAndroid Build Coastguard Worker
sparse_history
2021-12-02Merge empty history for sparse-7907387-L00500000952137325Android Build Coastguard Worker
Change-Id: I3049fba8775e83e44698d9ad16d592dda56e1e93
2021-12-02Merge "Merge cherrypicks of [1888795] into ↵android-cts-12.0_r2Android Build Coastguard Worker
sparse-7907387-L00500000952137325." into sparse-7907387-L00500000952137325
2021-12-02Merge cherrypicks of [1888795] into sparse-7907387-L00500000952137325.Android Build Coastguard Worker
Change-Id: I8df288e0492aa173e622ced9e183624e8359030c
2021-12-02Merge "Revert "Add the min aspect ratio to ActivityRecordProto and popu..."" ↵Android Build Coastguard Worker
into snap-temp-L00500000952137325
2021-12-02Revert "Add the min aspect ratio to ActivityRecordProto and popu..."Tom Natan
Revert submission 1876197-propagate_min_aspect_ratio Reason for revert: can't cherry pick framework change to this branch Reverted Changes: I023989da5:Use the min aspect ratio from ActivityRecordProto ... I1736cd4a2:Add the min aspect ratio to ActivityRecordProto an... Change-Id: I5840267bd2cf71234597da4dad09f7a7dd8e7a2c (cherry picked from commit d22dc839f9000edf81c76424ea1a11d17c3de430) Merged-In:I5840267bd2cf71234597da4dad09f7a7dd8e7a2c
2021-12-02Merge "Merge cherrypicks of [1888795] into ↵Android Build Coastguard Worker
sparse-7907387-L10600000952133081." into sparse-7907387-L10600000952133081
2021-12-02Merge cherrypicks of [1888795] into sparse-7907387-L10600000952133081.Android Build Coastguard Worker
Change-Id: I656b293f15d5ed0a77bd1eac9b5843fb192280de
2021-12-02Merge "Revert "Add the min aspect ratio to ActivityRecordProto and popu..."" ↵Android Build Coastguard Worker
into snap-temp-L10600000952133081
2021-12-02Revert "Add the min aspect ratio to ActivityRecordProto and popu..."Tom Natan
Revert submission 1876197-propagate_min_aspect_ratio Reason for revert: can't cherry pick framework change to this branch Reverted Changes: I023989da5:Use the min aspect ratio from ActivityRecordProto ... I1736cd4a2:Add the min aspect ratio to ActivityRecordProto an... Change-Id: I5840267bd2cf71234597da4dad09f7a7dd8e7a2c (cherry picked from commit d22dc839f9000edf81c76424ea1a11d17c3de430) Merged-In:I5840267bd2cf71234597da4dad09f7a7dd8e7a2c
2021-11-11Merge "Snap for 7906468 from 6e64d8ab6b077b50ce6faafd68a5f284cec05a5c to ↵sparse-7907387-L65300000952126381Android Build Coastguard Worker
android12-tests-release" into android12-tests-release
2021-11-11Snap for 7906468 from 6e64d8ab6b077b50ce6faafd68a5f284cec05a5c to ↵Android Build Coastguard Worker
android12-tests-release Change-Id: I0c8e890f9136a5fc91d6580b60813b77b400b619
2021-11-09Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert split bucket ↵Automerger Merge Worker
app upgrade default to true" into android11-tests-dev am: 60de9363f7 -s ours" into android12-tests-dev
2021-11-09[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert split bucket app ↵Treehugger Robot
upgrade default to true" into android11-tests-dev am: 60de9363f7 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1827015 Change-Id: I1e0e6c9e1434a998f4d4b8f0a1c6de66b8e2c760
2021-11-09Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Proto changes to ↵Automerger Merge Worker
update app upgade CTS" into android11-tests-dev am: cb63c63121 -s ours" into android12-tests-dev
2021-11-09[automerger skipped] Merge "[RESTRICT AUTOMERGE] Proto changes to update app ↵Treehugger Robot
upgade CTS" into android11-tests-dev am: cb63c63121 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1819021 Change-Id: Icac9ce46908ef3867e55cc38d7475c150969b633
2021-11-09Merge "Snap for 7897777 from a63efba114dd7ee2ccf6993dfa12623f57f7a4ab to ↵Android Build Coastguard Worker
android12-tests-release" into android12-tests-release
2021-11-09Snap for 7897777 from a63efba114dd7ee2ccf6993dfa12623f57f7a4ab to ↵Android Build Coastguard Worker
android12-tests-release Change-Id: Id3e80db7f3ae234c452728ed8c361639edf5dce5
2021-11-09Merge "[automerger skipped] Merge "[DO NOT MERGE]Update stats_log.proto for ↵Automerger Merge Worker
cts backfill" into android11-tests-dev am: 707f458542 -s ours" into android12-tests-dev
2021-11-09[automerger skipped] Merge "[DO NOT MERGE]Update stats_log.proto for cts ↵Treehugger Robot
backfill" into android11-tests-dev am: 707f458542 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1786948 Change-Id: I1c08a91e725a2ada51cb993c31413a414c6c294c
2021-11-05Merge "Snap for 7888331 from 4b778a7d2516f15202be68fd308f6d5d1fc0c370 to ↵Android Build Coastguard Worker
android12-tests-release" into android12-tests-release
2021-11-05Snap for 7888331 from 4b778a7d2516f15202be68fd308f6d5d1fc0c370 to ↵Android Build Coastguard Worker
android12-tests-release Change-Id: Ibac35e7999da0b2596b40da7f875b0add78fa4b1
2021-11-04Merge "Add the min aspect ratio to ActivityRecordProto and populate it" into ↵Treehugger Robot
android12-tests-dev
2021-11-01Add the min aspect ratio to ActivityRecordProto and populate ittomnatan
This is needed for CompatChangeTests to verify that the min aspect ratio is applied directly by checking the min aspect ratio. Bug: 203541827 Test: N/A Change-Id: I1736cd4a2c4a1c5857796fa9772def7b7d94ba33 Merged-In: I1736cd4a2c4a1c5857796fa9772def7b7d94ba33
2021-10-28Merge "Snap for 7863518 from 305a417ea78ae940c22ff2bf5caff8a1671d2e44 to ↵Android Build Coastguard Worker
android12-tests-release" into android12-tests-release
2021-10-28Snap for 7863518 from 305a417ea78ae940c22ff2bf5caff8a1671d2e44 to ↵Android Build Coastguard Worker
android12-tests-release Change-Id: If646791605d546c414c0323feb7dd6238597a9fb
2021-10-27Merge "[automerger skipped] Merge "Fix for TestDirectBootEmulated testcase" ↵Automerger Merge Worker
into android11-tests-dev am: ec568a975c -s ours" into android12-tests-dev
2021-10-27[automerger skipped] Merge "Fix for TestDirectBootEmulated testcase" into ↵Treehugger Robot
android11-tests-dev am: ec568a975c -s ours am skip reason: skipped by user paulcrowley Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559103 Change-Id: I31530ccb930095e85e69d01117ac8b66cac7a2bf
2021-10-27Merge "[automerger skipped] Merge "mkdir .incomplete in backing storage to ↵Automerger Merge Worker
fix CTS/GTS failures" into android11-tests-dev am: f6e442814a -s ours" into android12-tests-dev
2021-10-27[automerger skipped] Merge "mkdir .incomplete in backing storage to fix ↵Treehugger Robot
CTS/GTS failures" into android11-tests-dev am: f6e442814a -s ours am skip reason: skipped by user jsusbilla Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536156 Change-Id: Ie57a82ac77100640da481bf279d908905b0ce4f9
2021-10-27Merge "Merge "Merge "Fix CtsShortcutHostTestCases#testSecondaryUser" into ↵Automerger Merge Worker
android10-tests-dev am: d200d089df" into android11-tests-dev am: d5163650db" into android12-tests-dev
2021-10-27Merge "Merge "Fix CtsShortcutHostTestCases#testSecondaryUser" into ↵Automerger Merge Worker
android10-tests-dev am: d200d089df" into android11-tests-dev am: d5163650db Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1280653 Change-Id: I64cd7da357c4160797fb8005e8ed3b686e87b037
2021-10-27Merge changes from topic "am-f9a3bb8903ef43da82d1d195f2be598b" into ↵Automerger Merge Worker
android12-tests-dev * changes: Merge "[automerger skipped] Merge "Apply proper displayCutout rotation in density 480 dpi and 270 degrees rotation." into android10-tests-dev am: a13af898bd -s ours" into android11-tests-dev am: bc4aa9d326 [automerger skipped] Merge "Apply proper displayCutout rotation in density 480 dpi and 270 degrees rotation." into android10-tests-dev am: a13af898bd -s ours am: 28fa90e26d -s ours
2021-10-27Merge "[automerger skipped] Merge "Apply proper displayCutout rotation in ↵Automerger Merge Worker
density 480 dpi and 270 degrees rotation." into android10-tests-dev am: a13af898bd -s ours" into android11-tests-dev am: bc4aa9d326 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1205274 Change-Id: I34c590d0ea20ceb7abaede2febde37816ae78d4f
2021-10-27[automerger skipped] Merge "Apply proper displayCutout rotation in density ↵Treehugger Robot
480 dpi and 270 degrees rotation." into android10-tests-dev am: a13af898bd -s ours am: 28fa90e26d -s ours am skip reason: skipped by user svpawar Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1205274 Change-Id: I06503dde2e2ee4890129cbc25f0e81789fa56d76
2021-10-27Merge "Merge "[automerger skipped] Merge "Add minOccurs="0"" into ↵Automerger Merge Worker
android10-tests-dev am: 9f797b8f2a -s ours" into android11-tests-dev am: 75d475592c -s ours" into android12-tests-dev
2021-10-27Merge "[automerger skipped] Merge "Add minOccurs="0"" into ↵Automerger Merge Worker
android10-tests-dev am: 9f797b8f2a -s ours" into android11-tests-dev am: 75d475592c -s ours am skip reason: Merged-In Ib93a40e646f9c65bd62d23396c12ea31f2d735d8 with SHA-1 33bca5b12b is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1202365 Change-Id: I3571bd6d6f4093b302953ff9b4f3b3ca7086f308
2021-10-27Merge "Merge "[automerger skipped] Merge "Revert "Use language tags to store ↵Automerger Merge Worker
Configuration's locale list."" into android10-tests-dev am: 73d16b7f4d -s ours" into android11-tests-dev am: ea7ac3b947 -s ours" into android12-tests-dev
2021-10-27Merge "[automerger skipped] Merge "Revert "Use language tags to store ↵Automerger Merge Worker
Configuration's locale list."" into android10-tests-dev am: 73d16b7f4d -s ours" into android11-tests-dev am: ea7ac3b947 -s ours am skip reason: Merged-In I53946ed4e31de0ffe9c84875c391a7dec6f5375a with SHA-1 bd0ce4d42f is already in history. Merged-In was found from reverted change. Reverted change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1127164 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1199198 Change-Id: I88e07ac97d6d5d3749182918c2a5a341b9cca6c8
2021-10-18Merge "Snap for 7834066 from a181a4148921302874074859236ab2821141e87d to ↵Android Build Coastguard Worker
android12-tests-release" into android12-tests-release
2021-10-18Snap for 7834066 from a181a4148921302874074859236ab2821141e87d to ↵Android Build Coastguard Worker
android12-tests-release Change-Id: Ibc437b55b1b2567e071275c2dc32af24466bc239
2021-10-12Merge "Merge "[automerger skipped] Merge "Use language tags to store ↵Automerger Merge Worker
Configuration's locale list." into android10-tests-dev am: ad615de885 -s ours" into android11-tests-dev am: 3246426dd6 -s ours" into android12-tests-dev
2021-10-12Merge "[automerger skipped] Merge "Use language tags to store ↵Automerger Merge Worker
Configuration's locale list." into android10-tests-dev am: ad615de885 -s ours" into android11-tests-dev am: 3246426dd6 -s ours am skip reason: Merged-In I53946ed4e31de0ffe9c84875c391a7dec6f5375a with SHA-1 bd0ce4d42f is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1127164 Change-Id: I25b657edd207683b45fd9957481060e50259cf4d
2021-10-12Merge changes from topic "am-958173d3061b42e88a7a39f6b5d071c5" into ↵Automerger Merge Worker
android12-tests-dev * changes: Merge "[automerger skipped] Merge "AM: make isHighEndGfx TestApi" into android10-tests-dev am: a59e2cd3c4 -s ours" into android11-tests-dev am: c08503d12a [automerger skipped] Merge "AM: make isHighEndGfx TestApi" into android10-tests-dev am: a59e2cd3c4 -s ours am: cbdc89afee -s ours
2021-10-12Merge "[automerger skipped] Merge "AM: make isHighEndGfx TestApi" into ↵Automerger Merge Worker
android10-tests-dev am: a59e2cd3c4 -s ours" into android11-tests-dev am: c08503d12a Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1121324 Change-Id: I0d8018b400b578ff6aed9da6e44da8f3f75b6ab0
2021-10-12[automerger skipped] Merge "AM: make isHighEndGfx TestApi" into ↵Treehugger Robot
android10-tests-dev am: a59e2cd3c4 -s ours am: cbdc89afee -s ours am skip reason: skipped by user delphij Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1121324 Change-Id: I7eb6bb0e17f2a2e39213b7485cae21e893073afc
2021-10-12Merge "[automerger skipped] Merge "Revert "Move all BluetoothCodecConfig and ↵Automerger Merge Worker
BluetoothCodecStatus APIs moved from"" into android11-tests-dev am: 6ce73846c4 -s ours" into android12-tests-dev
2021-10-12[automerger skipped] Merge "Revert "Move all BluetoothCodecConfig and ↵Treehugger Robot
BluetoothCodecStatus APIs moved from"" into android11-tests-dev am: 6ce73846c4 -s ours am skip reason: Merged-In I29983284b1a1c271d983c99b286e204604abdc72 with SHA-1 57835f979c is already in history. Merged-In was found from reverted change. Reverted change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1443487 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1449263 Change-Id: I49ca9a625eeb097c1a69ee9ff02934d892537e15
2021-10-12Merge "[automerger skipped] Merge "Move all BluetoothCodecConfig and ↵Automerger Merge Worker
BluetoothCodecStatus APIs moved from the non-SDK API list to the blocklist in Android 11 back to the non-SDK API list." into android11-tests-dev am: 736e06ee91 -s ours" into android12-tests-dev
2021-10-12[automerger skipped] Merge "Move all BluetoothCodecConfig and ↵Treehugger Robot
BluetoothCodecStatus APIs moved from the non-SDK API list to the blocklist in Android 11 back to the non-SDK API list." into android11-tests-dev am: 736e06ee91 -s ours am skip reason: Merged-In I29983284b1a1c271d983c99b286e204604abdc72 with SHA-1 57835f979c is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1443487 Change-Id: I24ebf255ee81358c8fff4063a90f31973cd83050
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 17:39:58 +0000