Commit Graph

34841 Commits

Author SHA1 Message Date
Hongwei Wang
4d88492bf4 Add moveTaskToBack to PiP demo am: 8f10bb853f
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/23114477

Change-Id: I24ea54ec4eb4e84614f9f677269eb05074952f20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 19:43:16 +00:00
Hongwei Wang
8f10bb853f Add moveTaskToBack to PiP demo
Bug: 281452335
Test: m -j ApiDemos
Change-Id: I00a46f578171d248ccc7311c0f25cbb80de6a3ea
2023-05-09 10:18:00 -07:00
Pablo Gamito
c23945d94f Update Winscope proxy to collect both transition trace files am: edd0219c54
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/23024934

Change-Id: I4eccb9dcb2cd8dee4cc45f4b381a400525b827e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 13:50:34 +00:00
Pablo Gamito
edd0219c54 Update Winscope proxy to collect both transition trace files
Bug: 277181336
Test: npm run build:all && npm run test:all
Change-Id: I6697812fe929efe0927358fe14dc0ea155199631
2023-05-04 10:33:08 +00:00
Treehugger Robot
d5113a3d56 [automerger skipped] Merge "Generate license module from the vendor snapshot update.py" into udc-dev am: 811195d460 -s ours
am skip reason: Merged-In I7bbbf8bcec2a8c6d16ec1e04888dd5adf24ae4c7 with SHA-1 fc27ecc025 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/22878396

Change-Id: I5ec321cf364f45a97a8c459e5a5796f13c87cd83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 15:06:02 +00:00
Justin Yun
744bd03d5c [automerger skipped] Generate license module from the vendor snapshot update.py am: f6878cc645 -s ours
am skip reason: Merged-In I7bbbf8bcec2a8c6d16ec1e04888dd5adf24ae4c7 with SHA-1 fc27ecc025 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/22878396

Change-Id: I7a3cc7962b306e72701b80bcbcea7e92d61781b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 15:06:00 +00:00
Treehugger Robot
811195d460 Merge "Generate license module from the vendor snapshot update.py" into udc-dev 2023-04-29 14:22:50 +00:00
Treehugger Robot
2d33d1c4e3 Merge "Add a Python package for fetch_artifact." am: 9af4718984 am: 3a4e649a1f am: dd54efbcfd
Original change: https://android-review.googlesource.com/c/platform/development/+/2056220

Change-Id: I5439fc3dc14670441484ca5d5ae043eda8955b78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 10:46:53 +00:00
Treehugger Robot
dd54efbcfd Merge "Add a Python package for fetch_artifact." am: 9af4718984 am: 3a4e649a1f
Original change: https://android-review.googlesource.com/c/platform/development/+/2056220

Change-Id: I9b1c3f87a0b4f85288d444fe14403ba04df715ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 22:24:50 +00:00
Treehugger Robot
3a4e649a1f Merge "Add a Python package for fetch_artifact." am: 9af4718984
Original change: https://android-review.googlesource.com/c/platform/development/+/2056220

Change-Id: Ifc5e1d3447ba8384864353d72bdf763780026ae4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 21:45:10 +00:00
Treehugger Robot
9af4718984 Merge "Add a Python package for fetch_artifact." 2023-04-26 21:03:19 +00:00
Kean Mariotti
8dd1f97599 Merge "Improve logging in winscope_proxy.py" into udc-dev am: 7d26ddf5ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/22789196

Change-Id: I2569b340c15d67194205f1aa4d9abd4bb9102cff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 11:07:27 +00:00
Kean Mariotti
7d26ddf5ba Merge "Improve logging in winscope_proxy.py" into udc-dev 2023-04-26 10:22:49 +00:00
Treehugger Robot
d173ce4388 Merge "Generate license module from the vendor snapshot update.py" am: 4b636d2df0 am: 69c125945f am: 76216aae08
Original change: https://android-review.googlesource.com/c/platform/development/+/2542492

Change-Id: I69081f6f2aef638980bb191f009690b71208f1a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 05:02:48 +00:00
Treehugger Robot
76216aae08 Merge "Generate license module from the vendor snapshot update.py" am: 4b636d2df0 am: 69c125945f
Original change: https://android-review.googlesource.com/c/platform/development/+/2542492

Change-Id: I657f1e38c24a540f229c099595536627aa33160e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 03:02:27 +00:00
Treehugger Robot
69c125945f Merge "Generate license module from the vendor snapshot update.py" am: 4b636d2df0
Original change: https://android-review.googlesource.com/c/platform/development/+/2542492

Change-Id: I2ef8d7b2419a8f164633711bf6e3dd66871eaef0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 02:36:29 +00:00
Justin Yun
f6878cc645 Generate license module from the vendor snapshot update.py
`notice` property is removed from the soong. The update.py script
will generate `license` module, instead.
It will use the information included in the snapshot json files.

Bug: 271539873
Test: generate all kinds of snapshots and build against them
Merged-In: I7bbbf8bcec2a8c6d16ec1e04888dd5adf24ae4c7
Change-Id: I7bbbf8bcec2a8c6d16ec1e04888dd5adf24ae4c7
(cherry picked from commit fc27ecc025)
2023-04-26 11:28:43 +09:00
Treehugger Robot
4b636d2df0 Merge "Generate license module from the vendor snapshot update.py" 2023-04-26 01:53:02 +00:00
Justin Yun
fc27ecc025 Generate license module from the vendor snapshot update.py
`notice` property is removed from the soong. The update.py script
will generate `license` module, instead.
It will use the information included in the snapshot json files.

Bug: 271539873
Test: generate all kinds of snapshots and build against them
Change-Id: I7bbbf8bcec2a8c6d16ec1e04888dd5adf24ae4c7
2023-04-26 00:30:43 +00:00
Hsin-Yi Chen
e8f9a649b6 Merge "Add README about opt-in ABI dumps" am: 934663b2f0 am: ffbbed4edf am: 9b476625c6
Original change: https://android-review.googlesource.com/c/platform/development/+/2537631

Change-Id: Ic84bb1c6cf47d9a4251ce0bb49eaff2215ec6c75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 12:35:03 +00:00
Hsin-Yi Chen
9b476625c6 Merge "Add README about opt-in ABI dumps" am: 934663b2f0 am: ffbbed4edf
Original change: https://android-review.googlesource.com/c/platform/development/+/2537631

Change-Id: I516b812920d31aba61432a388495001bc34ce8af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 11:48:02 +00:00
Hsin-Yi Chen
ffbbed4edf Merge "Add README about opt-in ABI dumps" am: 934663b2f0
Original change: https://android-review.googlesource.com/c/platform/development/+/2537631

Change-Id: Ic7b9b3446c7290f12a565c30f3cfb1c17c7ca31a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 11:09:00 +00:00
Hsin-Yi Chen
934663b2f0 Merge "Add README about opt-in ABI dumps" 2023-04-25 10:24:17 +00:00
Alex Buynytskyy
ca3031518d Correct the minor version. am: 21162116f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/22835281

Change-Id: I9eea1d9b61a2d81456f5a7ae8c3ef4322354a3bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 04:50:17 +00:00
Alex Buynytskyy
21162116f9 Correct the minor version.
Bug: 275409981
Test: presubmit
Change-Id: I19000336a8dfcd50ee300694b611137faefdb42b
2023-04-25 01:38:07 +00:00
Alex Buynytskyy
8d297d637d Resetting Platform SDK and Build tools Version Numbers am: 117db136ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/22816008

Change-Id: I021fdd593c122a6e63a0b8bb39ee6fe60d9aab65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 23:42:53 +00:00
Alex Buynytskyy
117db136ae Resetting Platform SDK and Build tools Version Numbers
for Final Android-U SDK release post SDK Finalization. These version
numbers are used by Studio to trigger updates

Bug: 275409981
Test: N/A
Change-Id: I940e0e57170445861049ffb92ca6988b4c30bc3a
2023-04-24 21:01:31 +00:00
Xin Li
1583bb16f0 [automerger skipped] Merge "Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994" into stage-aosp-master am: 9e96ca15ed -s ours am: cec2a12bde -s ours
am skip reason: Merged-In I7aaaef7eb2ae6166bc914db81ffa1f557d4d62e1 with SHA-1 48ef808621 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/22719973

Change-Id: I6d8296e45687ed52dbb17bbc23337dcb16c95dfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 22:36:40 +00:00
Xin Li
f94633d750 [automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: fa48b40c3b -s ours am: 127a539b4d -s ours
am skip reason: Merged-In I7aaaef7eb2ae6166bc914db81ffa1f557d4d62e1 with SHA-1 48ef808621 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/22719973

Change-Id: Ica2d51fc1c82170525d6fc5dd6689df570f12805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 22:34:20 +00:00
Shaju Mathew
4b6e295cae [automerger skipped] Merge "Package version bump for U." am: 93396b2b35 am: 43f211f029 am: 56c4b1da4e -s ours
am skip reason: skipped by user begizi

Original change: https://android-review.googlesource.com/c/platform/development/+/2551670

Change-Id: Iefcef36014069f22248b47360dadf7dfed94b79d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 21:45:07 +00:00
Xin Li
cec2a12bde [automerger skipped] Merge "Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994" into stage-aosp-master am: 9e96ca15ed -s ours
am skip reason: Merged-In I7aaaef7eb2ae6166bc914db81ffa1f557d4d62e1 with SHA-1 48ef808621 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/22719973

Change-Id: Id4ecfc7855b8e17c4e0d5b0df1ded621ed98561c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 18:17:46 +00:00
Xin Li
127a539b4d [automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: fa48b40c3b -s ours
am skip reason: Merged-In I7aaaef7eb2ae6166bc914db81ffa1f557d4d62e1 with SHA-1 48ef808621 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/22719973

Change-Id: I8515a9cbbfc64b2bb7ce1372b03e6d90a2ab271a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 18:15:29 +00:00
Xin Li
9e96ca15ed Merge "Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994" into stage-aosp-master 2023-04-21 17:40:07 +00:00
Kean Mariotti
1e9651a0b5 Improve logging in winscope_proxy.py
Bug: b/278881845
Test: python3 src/adb/winscope_proxy.py and check that go/winscope can capture traces
Change-Id: I45b9eaf49bd21e691666e5132fb50cfc62629618
2023-04-21 16:35:27 +00:00
Treehugger Robot
8b561c24b7 Merge "Show default transaction values" into udc-dev 2023-04-21 14:45:49 +00:00
Shaju Mathew
e5c0858307 Conflict from tm-qpr-dev-plus-aosp to udc-dev
Bug: 279076938

Change-Id: Ie36e3dc4d63115462d12136be5a7a68eb00dd672
2023-04-21 05:23:41 +00:00
Shaju Mathew
56c4b1da4e Merge "Package version bump for U." am: 93396b2b35 am: 43f211f029
Original change: https://android-review.googlesource.com/c/platform/development/+/2551670

Change-Id: I6b5b6b5c0670525a97c34cb65596ba42f0214d36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 20:54:36 +00:00
Shaju Mathew
43f211f029 Merge "Package version bump for U." am: 93396b2b35
Original change: https://android-review.googlesource.com/c/platform/development/+/2551670

Change-Id: Ic67c0bd6850cb1f361fb3a7789e908515601b9e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 20:16:12 +00:00
Shaju Mathew
93396b2b35 Merge "Package version bump for U." 2023-04-20 19:36:53 +00:00
Shaju Mathew
faf2b3d078 Package version bump for U.
Test: treehugger

Bug: 279028960
Change-Id: Ie0553922f6c67bd9c15cb375ba335b646089a4ad
2023-04-20 16:44:06 +00:00
Inseob Kim
8738432db0 Merge "Add min_sdk_version prop to snapshots" am: 02b3862cda am: 520456adc1 am: 8992d6a493
Original change: https://android-review.googlesource.com/c/platform/development/+/2542490

Change-Id: Iafb740501cb54bd40d45868c6d8b561581d806fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 09:45:27 +00:00
Pablo Gamito
15460462e4 Show default transaction values
If we don't show the values it can be confusing to users what the value has changed to.

Test: NA
Change-Id: I8c19f2654dc5110fd35156545ff490998ae28b8b
2023-04-20 09:39:28 +00:00
Inseob Kim
8992d6a493 Merge "Add min_sdk_version prop to snapshots" am: 02b3862cda am: 520456adc1
Original change: https://android-review.googlesource.com/c/platform/development/+/2542490

Change-Id: If2eb25fc91b683cb71a2f672a74cca127ec66848
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 09:04:58 +00:00
Inseob Kim
520456adc1 Merge "Add min_sdk_version prop to snapshots" am: 02b3862cda
Original change: https://android-review.googlesource.com/c/platform/development/+/2542490

Change-Id: I277302b4c37c9a0d6264629318df12a55c3955d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 08:24:24 +00:00
Inseob Kim
02b3862cda Merge "Add min_sdk_version prop to snapshots" 2023-04-20 07:36:58 +00:00
Junghoon Jang
25dd9a2691 Merge "repo-pull: Introduce --ignore-unknown-changes arg" am: e4f118be6f am: 055ae89408 am: d1a1bdc184
Original change: https://android-review.googlesource.com/c/platform/development/+/2544230

Change-Id: I3fbdaaecb4d28eb4c5433614056e492ae5891315
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19 13:03:52 +00:00
Junghoon Jang
d1a1bdc184 Merge "repo-pull: Introduce --ignore-unknown-changes arg" am: e4f118be6f am: 055ae89408
Original change: https://android-review.googlesource.com/c/platform/development/+/2544230

Change-Id: Ie3ed911284c55e5fa46af95a51015b3e9ab47e94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19 12:18:55 +00:00
Junghoon Jang
055ae89408 Merge "repo-pull: Introduce --ignore-unknown-changes arg" am: e4f118be6f
Original change: https://android-review.googlesource.com/c/platform/development/+/2544230

Change-Id: I1a893e625817888e3c576de68c509387d3c47cb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19 11:38:51 +00:00
Junghoon Jang
e4f118be6f Merge "repo-pull: Introduce --ignore-unknown-changes arg" 2023-04-19 10:55:11 +00:00
Xin Li
fa48b40c3b Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994
Bug: 275386652
Merged-In: I7aaaef7eb2ae6166bc914db81ffa1f557d4d62e1
Change-Id: I948361782cc4d58a5c2b7528bfadfa0e5d97dcd7
2023-04-18 16:31:54 -07:00