summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-11-09Merge "Snap for 11077812 from 9f777becfaa93d5f6fbf6f0aea8bda957230e685 to ↵android-vts-12.0_r12android-vts-12.0_r11android-vts-12.0_r10android-cts-12.0_r12android-cts-12.0_r11android12-tests-releaseAndroid Build Coastguard Worker
android12-tests-release" into android12-tests-release
2023-11-09Snap for 11077812 from 9f777becfaa93d5f6fbf6f0aea8bda957230e685 to ↵Android Build Coastguard Worker
android12-tests-release Change-Id: Ic20df186b3cf2fb5eca43288598da96aa49f258a
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-02Merge "Snap for 9679079 from dcf85bf11a1dd3c0497dd098014d8cb4df2bdd94 to ↵android-vts-12.0_r9android-vts-12.0_r8android-cts-12.0_r9android-cts-12.0_r8android-cts-12.0_r10Android Build Coastguard Worker
android12-tests-release" into android12-tests-release
2023-03-02Snap for 9679079 from dcf85bf11a1dd3c0497dd098014d8cb4df2bdd94 to ↵Android Build Coastguard Worker
android12-tests-release Change-Id: I69cf9c00e19cbb4b667d70ddbb870298cdf040bf
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-03Merge "Snap for 9248778 from 533e4e9b352f0129aa45e005a2bd34d184afae47 to ↵android-vts-12.0_r7android-cts-12.0_r7Android Build Coastguard Worker
android12-tests-release" into android12-tests-release
2022-11-03Snap for 9248778 from 533e4e9b352f0129aa45e005a2bd34d184afae47 to ↵Android Build Coastguard Worker
android12-tests-release Change-Id: I028c4289bda9d5acfbdadeed61e4815f5439510c
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 "Snap for 8134292 from d83584f158082bdbc10995c322aa76bbb816b23e to ↵android-vts-12.0_r6android-vts-12.0_r5android-vts-12.0_r4android-cts-12.0_r6android-cts-12.0_r5android-cts-12.0_r4Android Build Coastguard Worker
android12-tests-release" into android12-tests-release
2022-01-31Snap for 8134292 from d83584f158082bdbc10995c322aa76bbb816b23e to ↵Android Build Coastguard Worker
android12-tests-release Change-Id: I8204015058acf5942f291e251617b302ea6a2a0a
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 "Snap for 8090032 from f8e5b70e07eb931eedb5990475ad0278321d8f51 to ↵android-vts-12.0_r3Android Build Coastguard Worker
android12-tests-release" into android12-tests-release
2022-01-18Snap for 8090032 from f8e5b70e07eb931eedb5990475ad0278321d8f51 to ↵Android Build Coastguard Worker
android12-tests-release Change-Id: I51476a577c4a3f7276675736d4d9ae98bf47c5c7
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 "Snap for 8043976 from 2945efd7006c162017adcd382f3e57ad32efa86f to ↵android-cts-12.0_r3Android Build Coastguard Worker
android12-tests-release" into android12-tests-release
2022-01-05Snap for 8043976 from 2945efd7006c162017adcd382f3e57ad32efa86f to ↵Android Build Coastguard Worker
android12-tests-release Change-Id: Ia54874a29bccfbe5a618d5e2427462c8f37c79f2
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-16Merge "Snap for 7918510 from 3ba80f4033aa54ca057506d2889859172dbe996b to ↵android-vts-12.0_r2Android Build Coastguard Worker
android12-tests-release" into android12-tests-release
2021-11-16Snap for 7918510 from 3ba80f4033aa54ca057506d2889859172dbe996b to ↵Android Build Coastguard Worker
android12-tests-release Change-Id: I517a0da88e93a640e1ced7e3d1800c2a0f05f0f3
2021-11-15Merge "Revert "Add the min aspect ratio to ActivityRecordProto and popu..."" ↵Treehugger Robot
into android12-tests-dev
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-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 "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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 22:45:03 +0000