Priyanka Patel
e228166ec3
Merge "Add display support for tag fields and app pairs."
2021-09-09 08:53:23 +00:00
Jason Macnak
5658d124e5
Merge "Suffix libash with _rust to avoid name conflict" am: 7b3f02465b am: fc70e26304 am: 4706d98b53 am: 039c0d088f am: 9b9223c621
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1819312
Change-Id: I8307243ab75d08cb7fbddec08ef532bcbd36dec6
2021-09-08 18:02:14 +00:00
Jason Macnak
9b9223c621
Merge "Suffix libash with _rust to avoid name conflict" am: 7b3f02465b am: fc70e26304 am: 4706d98b53 am: 039c0d088f
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1819312
Change-Id: I9d2b38766b8ad645e1970f7f59343f5fdb543f9c
2021-09-08 17:48:15 +00:00
Jason Macnak
039c0d088f
Merge "Suffix libash with _rust to avoid name conflict" am: 7b3f02465b am: fc70e26304 am: 4706d98b53
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1819312
Change-Id: I4fbcf1694a29b236634c51b415e1923df9633164
2021-09-08 17:34:26 +00:00
Jason Macnak
4706d98b53
Merge "Suffix libash with _rust to avoid name conflict" am: 7b3f02465b am: fc70e26304
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1819312
Change-Id: I4c6223e02deef5b8eea8185df7d216f0f7d4318d
2021-09-08 17:16:43 +00:00
Jason Macnak
fc70e26304
Merge "Suffix libash with _rust to avoid name conflict" am: 7b3f02465b
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1819312
Change-Id: I33efcfba8eeebb0d2c148f6fe0b2cb118eab82f7
2021-09-08 17:00:20 +00:00
Jason Macnak
7b3f02465b
Merge "Suffix libash with _rust to avoid name conflict"
2021-09-08 16:43:34 +00:00
Priyanka
b415682b29
Add display support for tag fields and app pairs.
...
LayerId now present on windows, and window token will be added to tags
where possible, so display support added on frontend. Also, app pairs
transitions added to colour code.
Bug: b/199274556
Test: upload a trace to ensure everything still displays as normal.
Change-Id: I5d0c2e26ac5f18090d0fe6e8df5f4e1305822c41
2021-09-08 15:10:08 +00:00
Lukács T. Berki
a497569cc1
Merge "Update the way one generates the Bazel workspace." am: a96722e794 am: 73869d8585 am: 370b9c7416 am: 93395a7878 am: 1c589d0306
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1818333
Change-Id: I5d8570ef1becf33ad961976c5fd596f14369a309
2021-09-07 07:23:07 +00:00
Lukács T. Berki
1c589d0306
Merge "Update the way one generates the Bazel workspace." am: a96722e794 am: 73869d8585 am: 370b9c7416 am: 93395a7878
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1818333
Change-Id: Id5b2badfa747f1ea790e3ec29c34d60e2db15744
2021-09-07 07:08:00 +00:00
Lukács T. Berki
93395a7878
Merge "Update the way one generates the Bazel workspace." am: a96722e794 am: 73869d8585 am: 370b9c7416
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1818333
Change-Id: I7304200dbdc53c157450b6f0b68785808cd37c28
2021-09-07 06:55:23 +00:00
Lukács T. Berki
370b9c7416
Merge "Update the way one generates the Bazel workspace." am: a96722e794 am: 73869d8585
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1818333
Change-Id: I474d81c59666793d3389c22fe9301a32f27af472
2021-09-07 06:32:13 +00:00
Lukács T. Berki
73869d8585
Merge "Update the way one generates the Bazel workspace." am: a96722e794
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1818333
Change-Id: I162c890b6a42a43456e60f4f1413d4ab73688cb4
2021-09-07 06:17:22 +00:00
Lukács T. Berki
a96722e794
Merge "Update the way one generates the Bazel workspace."
2021-09-07 06:08:07 +00:00
TreeHugger Robot
e0e7565fbd
Merge "Pass layerId from proto data through to WindowContainer constructor"
2021-09-06 16:56:41 +00:00
TreeHugger Robot
493fd1cd04
Merge "Change defaults to 0 for taskId and layerId."
2021-09-06 16:44:40 +00:00
Lukacs T. Berki
9206f1c08b
Update the way one generates the Bazel workspace.
...
Test: Presubmits.
Change-Id: I0edfe61e78d04fcb468c68136ba1da3ee6e3fd1c
2021-09-06 11:36:59 +02:00
Jason Macnak
051340de9e
Suffix libash with _rust to avoid name conflict
...
Bug: b/189133061
Test: presubmit with attached topic
Change-Id: I6619857a7f632fe7ab0576dd0dd0fe4dacf677b1
2021-09-04 11:04:26 -07:00
Nataniel Borges
1886a75f66
[automerger skipped] [DO NOT MERGE] Sync flicker from master to sc-v2 am: 325b0476f5 am: c8dad66975 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15737825
Change-Id: If21f6f4d580f2abea6591cbf5290a881fd0c3a97
2021-09-04 00:53:07 +00:00
Nataniel Borges
c8dad66975
[DO NOT MERGE] Sync flicker from master to sc-v2 am: 325b0476f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15737825
Change-Id: I98cc88b49f25f7066e9b4de4dc2b1e27b7b4528d
2021-09-04 00:36:01 +00:00
Priyanka
6d70b2ed93
Change defaults to 0 for taskId and layerId.
...
Bug: b/198634721
Test: check upload of tags with only a taskId or a layerId.
Change-Id: I8fc44f6074a1e17264177d251f1bd7ba319701d2
2021-09-03 15:12:19 +00:00
Priyanka
70283c4740
Group tags by id and transition.
...
Tag Id increments for each additional transition of the same type but
resets to zero as each processor is called. This fix groups tags by both
id and transition to avoid confusion.
Bug: b/198757467
Test: upload a trace with multiple types of transition, where
transitions have the same tag id.
Change-Id: Idad9c04dc5ac01faf0234d131cbb03364b2ccc36
2021-09-03 13:04:32 +00:00
Pablo Gamito
592e789e97
Pass layerId from proto data through to WindowContainer constructor
...
Test: N/A
Change-Id: I8a8db9b496567c0777a1008bc3040fe3f25999e8
2021-09-03 12:43:32 +02:00
Isaac Chen
31b30204be
Merge "Create an arm64 kernel module to test arm64 KMI" am: f1f176fa45 am: 9f9be21a51 am: 07f00284ed am: 8ecad96fa6 am: 430f63a90c
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1816780
Change-Id: I8307a0cc88aeb428f59b9faed4066dc530c6720e
2021-09-03 07:51:53 +00:00
Isaac Chen
430f63a90c
Merge "Create an arm64 kernel module to test arm64 KMI" am: f1f176fa45 am: 9f9be21a51 am: 07f00284ed am: 8ecad96fa6
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1816780
Change-Id: Idf071c8d1919a727a081307369e164b9a4a0e2f4
2021-09-03 07:33:24 +00:00
Isaac Chen
8ecad96fa6
Merge "Create an arm64 kernel module to test arm64 KMI" am: f1f176fa45 am: 9f9be21a51 am: 07f00284ed
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1816780
Change-Id: I080d4c346b8d090c920545597e4f716698e4c3cf
2021-09-03 07:21:54 +00:00
Isaac Chen
07f00284ed
Merge "Create an arm64 kernel module to test arm64 KMI" am: f1f176fa45 am: 9f9be21a51
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1816780
Change-Id: I8f0a40eb478017bdecb47d4fb952cfbb624e2025
2021-09-03 07:06:52 +00:00
Isaac Chen
9f9be21a51
Merge "Create an arm64 kernel module to test arm64 KMI" am: f1f176fa45
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1816780
Change-Id: Ic1dadb1c17c9c59f139357ceccc7f7c728ae1021
2021-09-03 06:53:44 +00:00
Isaac Chen
f1f176fa45
Merge "Create an arm64 kernel module to test arm64 KMI"
2021-09-03 06:40:40 +00:00
Isaac Chen
bc82a1de7e
Create an arm64 kernel module to test arm64 KMI
...
This kernel module uses all the kernel symbols supported by arm64 GKI
build 7618735, the first arm64 GKI release (respin 5) for Android 12.
Bug: 196933449
Test: Load kmi_sym.ko on arm64 GKI on GF successfully. See README for details.
Change-Id: Idf4c9f5dcac128faf4d08bf9cdec780d0dd54ed8
2021-09-03 12:15:01 +08:00
Priyanka
06873c96cf
Fix logic for multiple tags with same id.
...
Bug: b/198622547
Test: upload the traces attached to the bug to ensure a rotation
displays on the timeline.
Change-Id: I6acd8bf0bdbd5d2ad15664dcd16096a711697440
2021-09-02 15:21:30 +00:00
Joel Galenson
1dbc640a6a
Merge "Generate cargo_pkg_version and cargo_env_compat for defaults." am: 1eda0d9208 am: a7cb52801f am: 0f4925b037 am: 48023b40f7 am: 9995e5f687
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1815080
Change-Id: I2be512ccd9cae85d19feefc21f4b8f8f5babae09
2021-09-01 16:48:16 +00:00
Joel Galenson
9995e5f687
Merge "Generate cargo_pkg_version and cargo_env_compat for defaults." am: 1eda0d9208 am: a7cb52801f am: 0f4925b037 am: 48023b40f7
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1815080
Change-Id: Ibbd16dcc9981f31ec9631f6ee2708c3c3addd05d
2021-09-01 16:27:31 +00:00
Joel Galenson
48023b40f7
Merge "Generate cargo_pkg_version and cargo_env_compat for defaults." am: 1eda0d9208 am: a7cb52801f am: 0f4925b037
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1815080
Change-Id: I4d9d02852debb4e9b725c60314cdaa59c56368b7
2021-09-01 16:13:27 +00:00
Joel Galenson
0f4925b037
Merge "Generate cargo_pkg_version and cargo_env_compat for defaults." am: 1eda0d9208 am: a7cb52801f
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1815080
Change-Id: Ie17eb50e619550ba8997c7e8a184ac7fcf2c736f
2021-09-01 15:58:47 +00:00
Joel Galenson
a7cb52801f
Merge "Generate cargo_pkg_version and cargo_env_compat for defaults." am: 1eda0d9208
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1815080
Change-Id: Ie91b0f781994feacaa928fc9e287ddc9393eb1f9
2021-09-01 15:43:42 +00:00
Kelvin Zhang
4c253b5284
Merge changes Ic5fdefe2,I32cbd027,I464d846c,Ie9ef8e2b,Ib7b02d5c am: e6ae7c629b am: 8834603a01 am: a30572e3a4 am: 06bfa0009e am: 93ddcc59d9
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1815621
Change-Id: Ib20dee3d3484d5f1ad785eacdbbec3e620533905
2021-09-01 15:34:03 +00:00
Kelvin Zhang
a230cdc9b6
Merge "Cancel polling task after component unmount" am: 3862d22d0e am: b1da09b852 am: 8a287efeea am: c2272f8e82 am: bd2f4b0e13
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1815616
Change-Id: I939fa8046e9a0100e7704c62c9b2742ba7104a7c
2021-09-01 15:33:55 +00:00
Kelvin Zhang
623e83e227
Merge "Remove noop try catch statements" am: 401c6d5d23 am: 5e1f196247 am: 5a581bdeb3 am: ad98f50a84 am: 0f9c47934c
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1815095
Change-Id: I16b4bafca9efd85da23f81012d82f272070c8844
2021-09-01 15:33:45 +00:00
Joel Galenson
1eda0d9208
Merge "Generate cargo_pkg_version and cargo_env_compat for defaults."
2021-09-01 15:28:02 +00:00
Kelvin Zhang
93ddcc59d9
Merge changes Ic5fdefe2,I32cbd027,I464d846c,Ie9ef8e2b,Ib7b02d5c am: e6ae7c629b am: 8834603a01 am: a30572e3a4 am: 06bfa0009e
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1815621
Change-Id: I47799c78c525f3334f7eb02c1610ee1dc284d8e1
2021-09-01 15:18:30 +00:00
Kelvin Zhang
bd2f4b0e13
Merge "Cancel polling task after component unmount" am: 3862d22d0e am: b1da09b852 am: 8a287efeea am: c2272f8e82
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1815616
Change-Id: Id9cc96c9d39f22d2165ae14f764a47ef37799f2d
2021-09-01 15:18:19 +00:00
Kelvin Zhang
0f9c47934c
Merge "Remove noop try catch statements" am: 401c6d5d23 am: 5e1f196247 am: 5a581bdeb3 am: ad98f50a84
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1815095
Change-Id: I0f523f35cf0fd72e8c1d1a499c98d4e7caf66c1f
2021-09-01 15:18:04 +00:00
Kelvin Zhang
06bfa0009e
Merge changes Ic5fdefe2,I32cbd027,I464d846c,Ie9ef8e2b,Ib7b02d5c am: e6ae7c629b am: 8834603a01 am: a30572e3a4
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1815621
Change-Id: I86d4770011ff66a3681143f0f782c191f1a6ba78
2021-09-01 15:04:16 +00:00
Kelvin Zhang
c2272f8e82
Merge "Cancel polling task after component unmount" am: 3862d22d0e am: b1da09b852 am: 8a287efeea
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1815616
Change-Id: Ic9dcaae4319cafaa43c416c188e64566d1bf8532
2021-09-01 15:04:10 +00:00
Kelvin Zhang
ad98f50a84
Merge "Remove noop try catch statements" am: 401c6d5d23 am: 5e1f196247 am: 5a581bdeb3
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1815095
Change-Id: I90aafa44a5260ed52a3524ff959d9c83f9fd0614
2021-09-01 15:04:04 +00:00
Kelvin Zhang
a30572e3a4
Merge changes Ic5fdefe2,I32cbd027,I464d846c,Ie9ef8e2b,Ib7b02d5c am: e6ae7c629b am: 8834603a01
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1815621
Change-Id: Ifa73b12a346a8640c29a5891e6634f6d3085225d
2021-09-01 14:49:34 +00:00
Kelvin Zhang
8a287efeea
Merge "Cancel polling task after component unmount" am: 3862d22d0e am: b1da09b852
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1815616
Change-Id: If420d4df57710175c396ccaed8495d5a815a95b1
2021-09-01 14:49:28 +00:00
Kelvin Zhang
5a581bdeb3
Merge "Remove noop try catch statements" am: 401c6d5d23 am: 5e1f196247
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1815095
Change-Id: Ia400ac7117bef190aef6538a01666142c5157b67
2021-09-01 14:49:22 +00:00
Kelvin Zhang
8834603a01
Merge changes Ic5fdefe2,I32cbd027,I464d846c,Ie9ef8e2b,Ib7b02d5c am: e6ae7c629b
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1815621
Change-Id: I18cc97ec071980725514785aafdd7927821410b8
2021-09-01 14:34:23 +00:00