summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-11-09Merge "Update OWNERS (cherry picked from ↵android12-tests-devPaul Colța
https://googleplex-android-review.googlesource.com/q/commit:68d82ec47cd4b6414e3c8aab0a81e319e657f222) Merged-In: Iabec62cb23301d00a2e7d4808a801b443f0fb392 Change-Id: Iabec62cb23301d00a2e7d4808a801b443f0fb392" into android12-tests-dev
2023-11-07Update OWNERSPaul Colța
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:68d82ec47cd4b6414e3c8aab0a81e319e657f222) Merged-In: Iabec62cb23301d00a2e7d4808a801b443f0fb392 Change-Id: Iabec62cb23301d00a2e7d4808a801b443f0fb392
2023-03-01Merge "Merge "Update OWNERS for MediaProjection & related classes" into ↵Automerger Merge Worker
android11-tests-dev am: d6533d0bf9" into android12-tests-dev
2023-03-01Merge "Update OWNERS for MediaProjection & related classes" into ↵Treehugger Robot
android11-tests-dev am: d6533d0bf9 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2441290 Change-Id: I8e1ccc4a9e481c8859ef265a34ef309f56679f52 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01Merge "Update OWNERS for MediaProjection & related classes" into ↵android11-tests-devTreehugger Robot
android11-tests-dev
2023-02-16Update OWNERS for MediaProjection & related classesNaomi Musgrave
Change-Id: I5af357405c2b4e2da87954612080fa85d08f991d Bug: 261563516 (cherry picked from commit abccffcc0abf85f4ac87179fc5235bfa3fdbfd8c)
2022-11-02Merge "Add new owner to the resume-on-reboot module." into android12-tests-devEric Zhang
2022-10-11Add new owner to the resume-on-reboot module.Eric Zhang
Test: Adding owners. No code change. Change-Id: I5af32f68652d5854e6a99b59f2f56fcaac575588 (cherry picked from commit 8c8d787bc66920fb62188a23a09fcd9641219cfb) Merged-In: I5af32f68652d5854e6a99b59f2f56fcaac575588
2022-01-31Merge "[automerger skipped] Merge "[DO NOT MERGE] Add Storage OWNERS" into ↵Automerger Merge Worker
android11-tests-dev am: 2adae18d0e -s ours" into android12-tests-dev
2022-01-31[automerger skipped] Merge "[DO NOT MERGE] Add Storage OWNERS" into ↵Treehugger Robot
android11-tests-dev am: 2adae18d0e -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1965039 Change-Id: Id210f9f467ae70c34e5c7e67a5a152a1da8e0c76
2022-01-31Merge "[DO NOT MERGE] Add Storage OWNERS" into android11-tests-devTreehugger Robot
2022-01-28[DO NOT MERGE] Add Storage OWNERSBruno Demartino
Add OWNERS to android11-tests-dev based on master. This is needed to backport the CTS owners change that references this file (https://android-review.googlesource.com/c/platform/cts/+/1963146). The file already exists in android12-tests-dev and higher. Bug: 215859718 Test: presubmit Change-Id: I2b7063e90a2ed3ff19537492d3c2741dbbbf5545
2022-01-18Merge "[automerger skipped] Merge "Added systemui controller to control ↵Shubhangi Pawar
system bars." into android11-tests-dev am: e5e9acc7a5 -s ours" into android12-tests-dev
2022-01-07[automerger skipped] Merge "Added systemui controller to control system ↵Treehugger Robot
bars." into android11-tests-dev am: e5e9acc7a5 -s ours am skip reason: Merged-In Ie6b1cc3e2760cbc9e48d62dfbd8bc3e23ffca20c with SHA-1 2c403a6526 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1920126 Change-Id: I75efc27fb1dc19fc2e20a2c7f36d8fc492d84e5a
2022-01-07Merge "Added systemui controller to control system bars." into ↵Treehugger Robot
android11-tests-dev
2022-01-05Merge "Allow negative value for CorrelationVector#samplingStartM" into ↵Treehugger Robot
android12-tests-dev
2021-12-27Allow negative value for CorrelationVector#samplingStartMShinru Han
Bug: 195934893 Test: atest ctsLocationPrivilegedTestCases Change-Id: I255e118cabf274811b57e88a35faf8c9e697d8ae
2021-12-09Added systemui controller to control system bars.JianYang Liu
When config_remoteInsetsControllerControlsSystemBars is true, DisplaySystemBarsController provides its own policy of how system bars are displayed for specific packages. Currently limited to only auto versions of Android. Bug: 149585273 Test: Manual, atest BarControlPolicyTest, atest InsetsPolicyTest, atest DisplaySystemBarsControllerTest Change-Id: Ie6b1cc3e2760cbc9e48d62dfbd8bc3e23ffca20c Merged-In: Ie6b1cc3e2760cbc9e48d62dfbd8bc3e23ffca20c
2021-11-15Merge "Revert "Add the min aspect ratio to ActivityRecordProto and popu..."" ↵Treehugger Robot
into android12-tests-dev
2021-11-11Revert "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
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 "[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-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-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-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-05-28 19:46:36 +0000