Commit Graph

33340 Commits

Author SHA1 Message Date
Kean Mariotti
f339fe9f42 add e2e test infrastracture (protractor-based)
Test: npm run test:e2e
Change-Id: I5b9c227e4538bb64410b3bf2aa5543c91a23a0f2
2022-07-05 17:42:42 +00:00
Kean Mariotti
7f1e9e3c45 enable Angular production mode
Test: npm run build:prod
Change-Id: Iadfe6f81b0cfb611aa6b9266a08424927d82c5d1
2022-07-05 17:09:00 +00:00
Kean Mariotti
6cbe5e5e04 deploy Winscope as single html file
Test: npm run build:prod
Change-Id: I0766d9071566750dc9cdd4d9fb0c4c672b94e8e2
2022-07-05 17:05:18 +00:00
Kean Mariotti
dc2d967182 Merge "winscope-ng initial commit" 2022-07-05 05:38:09 +00:00
Kean Mariotti
0610eb8c0d winscope-ng initial commit
- webpack-based dev environment
- unit tests (node-based)
- Angular component tests (karma-based)
- Protobuf parsers:
    - Accessibility
    - Input Method Clients
    - Input Method Manager Service
    - Input Method Service
    - ProtoLog
    - SurfaceFlinger
    - Transactions
    - WindowManager
- Kotlin -> JavaScript transpilation of flickerlib

Bug: 236369779
Bug: 236369812
Test: npm run test:unit && npm run test:component
Change-Id: Ib4ffc34634b088a39e8fbf3c400be56a1015e9a5
2022-07-04 13:43:45 +00:00
Hui Ling Shi
f173304883 Merge "[6] Fix infinite loop for IME processing" 2022-07-01 09:31:15 +00:00
Hui Ling Shi
59601d7126 Merge "[5] Modify "kind" attribute of trace entries" 2022-07-01 09:31:06 +00:00
Hui Ling Shi
01dba6d0cc Merge "[4] Refine WM&SF Properties sub-panel" 2022-07-01 09:30:55 +00:00
Hui Ling Shi
b339c476a5 Merge "[3] Add WM&SF Properties sub-panel in IME panels" 2022-07-01 08:43:51 +00:00
Hui Ling Shi
e0e201d725 [6] Fix infinite loop for IME processing
Previously, some Winscope traces and ADB captures will go into an
infinite loop after IME processing was introduced.
The issue was a loop in filtering the SF Layer node that did not
account for multi-windowing mode or cases where the expected parent
could not be found. This commit fixes this issue.

Bug: 236679852
Test: manual with previously failing traces
Change-Id: I8d3fe42802efa195926b5be0d4242a0bb0696988
2022-07-01 07:47:53 +00:00
Hui Ling Shi
6fbc98df12 [5] Modify "kind" attribute of trace entries
- Add constants to flickerlib's common.js defining the "kind" of
WindowManager and SurfaceFlinger entries
- Modify flickerlib's WindowManagerState and LayerTraceEntry,
as well as ime_processing.js, to use these constants
- Modify the "kind" of IME entries directly in transform_ime.js.
In the future, these should also be constants defined in flickerlib

Bug: 236226833
Test: manual on local build

Change-Id: I310f301e82ae976a202ca1c8cc40c7b686a9723f
2022-07-01 07:47:52 +00:00
Hui Ling Shi
9ba943f1b0 [4] Refine WM&SF Properties sub-panel
- Extract specific WM / SF properties and display only in relevant IME
panel(s) (Client / Service / ManagerService)
- Add clickable items in 'WM & SF Properties' sub-panel that shows full
tree in 'Properties' sub-panel

Screenshots:
- ManagerService: https://screenshot.googleplex.com/ZkoDs8SfxLtprH5.png
- Clients: https://screenshot.googleplex.com/7PT6GG8YRbNrDcC
- Service panel displays the same properties as Clients panel

Bug: 236226833
Test: manual on local build of winscope

Change-Id: Ie96e17cf32311e56af66f8cee66e4f92b9751b5b
2022-07-01 07:47:52 +00:00
Hui Ling Shi
2a80be87df [3] Add WM&SF Properties sub-panel in IME panels
If there are WM or SF trace entries that correspond with IME trace
entries (i.e. the WM/SF entry comes before the IME entry in time),
the 'WM & SF Properties' sub-panel will be displayed below the
'Hierarchy' sub-panel in the IME trace panel.

- This sub-panel currently displays properties extracted from
WM entry, not yet SF entry.
- Code is added in 'ime_processing.js' to extract WM properties,
and 'freeze: false' is set in 'transform_ime.js' so that IME entry
objects are not frozen and can be modified during processing
- SF entry, displayed as a tree in the Hierarchy sub-panel, is pruned
to only ImeContainer or IME-snapshot node and its sibling nodes.

Note: there is a bug in this CL (b/236679852) that is fixed later
in CL[6]. Also, null values are not handled well in this CL, and
will be fixed later in CL[4].

Screenshot: https://screenshot.googleplex.com/6RXiRyX47qLAL9i.png

Bug: 236226833
Test: manual on local winscope

Change-Id: I07be7f492a6275c3fdafd6d1f523fdf4d552d16b
2022-07-01 07:47:50 +00:00
Mu-Le Lee
ef212825da Merge "Create a cli option to build only the specified target rather than the whole package." am: 59b0ddfffd am: cff9bcf5ae am: f321dc9d19 am: 530fe0a0b9 am: 3a0269014c
Original change: https://android-review.googlesource.com/c/platform/development/+/2136832

Change-Id: Ieb1553a36fd0a7a8c9d58e76bf30efb1d16301b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 06:28:54 +00:00
Mu-Le Lee
3a0269014c Merge "Create a cli option to build only the specified target rather than the whole package." am: 59b0ddfffd am: cff9bcf5ae am: f321dc9d19 am: 530fe0a0b9
Original change: https://android-review.googlesource.com/c/platform/development/+/2136832

Change-Id: Id60eb7e9ac18f932c0c62ab139d63c965376b4fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 06:12:13 +00:00
Mu-Le Lee
530fe0a0b9 Merge "Create a cli option to build only the specified target rather than the whole package." am: 59b0ddfffd am: cff9bcf5ae am: f321dc9d19
Original change: https://android-review.googlesource.com/c/platform/development/+/2136832

Change-Id: I549414003fe1b362ab39c09adc1dab301a648b78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 05:56:14 +00:00
Mu-Le Lee
f321dc9d19 Merge "Create a cli option to build only the specified target rather than the whole package." am: 59b0ddfffd am: cff9bcf5ae
Original change: https://android-review.googlesource.com/c/platform/development/+/2136832

Change-Id: I04da40b57ad916c7d35ea3f1a9d005974d2cce5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 05:22:11 +00:00
Mu-Le Lee
cff9bcf5ae Merge "Create a cli option to build only the specified target rather than the whole package." am: 59b0ddfffd
Original change: https://android-review.googlesource.com/c/platform/development/+/2136832

Change-Id: I3db3e75ee1620e5cbf539966b0cddef35c7838cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 05:04:11 +00:00
Mu-Le Lee
59b0ddfffd Merge "Create a cli option to build only the specified target rather than the whole package." 2022-07-01 04:36:57 +00:00
Mu-Le Lee
83c7085316 Create a cli option to build only the specified target rather than the whole package.
Test: OUT_DIR=out development/vndk/tools/header-checker/android/build-prebuilts.sh \
      header-abi-dumper header-abi-linker
Bug: 237229904
Change-Id: I2f52ac39201a50f081c8393528ad9dc8e953a556
2022-07-01 02:43:24 +00:00
Xin Li
5686aae86e [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 33c6138be7 -s ours am: 8a1f3b151f -s ours am: 93cc26a390 -s ours am: 6396ca412e -s ours
am skip reason: Merged-In I794bcb9e9c922c642c3fbf0808fb60de4445ab65 with SHA-1 e5f137adf2 is already in history

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

Change-Id: Ib4c698758be67538612de05c45c9bb655c13a7ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 01:04:37 +00:00
Xin Li
6396ca412e [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 33c6138be7 -s ours am: 8a1f3b151f -s ours am: 93cc26a390 -s ours
am skip reason: Merged-In I794bcb9e9c922c642c3fbf0808fb60de4445ab65 with SHA-1 e5f137adf2 is already in history

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

Change-Id: I32a0320298c8b04aebafe508485c801fd14eeb69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 00:02:05 +00:00
Xin Li
93cc26a390 [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 33c6138be7 -s ours am: 8a1f3b151f -s ours
am skip reason: Merged-In I794bcb9e9c922c642c3fbf0808fb60de4445ab65 with SHA-1 e5f137adf2 is already in history

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

Change-Id: Ia0ed3c2689a468af469a33ca43f4f37f25e1ded2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29 22:56:21 +00:00
Xin Li
8a1f3b151f [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 33c6138be7 -s ours
am skip reason: Merged-In I794bcb9e9c922c642c3fbf0808fb60de4445ab65 with SHA-1 e5f137adf2 is already in history

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

Change-Id: Ied5e19587c978765cb62f4eab8423377bf074ef2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29 22:12:50 +00:00
Hongwei Wang
f1361d0f72 Add ability to enter PiP on back pressed in ApiDemos am: 8d408e82c1 am: a31acd7dbf
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/19087608

Change-Id: Ica6ceae87d5e68f62543c9c2740f344efecd5c5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 16:49:10 +00:00
Hongwei Wang
a31acd7dbf Add ability to enter PiP on back pressed in ApiDemos am: 8d408e82c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/19087608

Change-Id: I79c7aa2fe00e6fed0f2c7e88b955d2c24b6c490d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 16:45:58 +00:00
Xin Li
33c6138be7 Merge tm-dev-plus-aosp-without-vendor@8763363
Bug: 236760014
Merged-In: I794bcb9e9c922c642c3fbf0808fb60de4445ab65
Change-Id: Id292c36692b0020d772dc61b863f9cd3b39fe0c5
2022-06-27 23:37:25 +00:00
Mu-Le Lee
a33163bc07 Merge "Remove location information of unnamed elements in dumps to avoid automerge conflict." am: aa22b20007 am: 54447f3246 am: 4841d51f3a am: 3e5585e896 am: 4d7c3e3dc5
Original change: https://android-review.googlesource.com/c/platform/development/+/2136214

Change-Id: I8bbaa825698a67d4583465a51fae12eee81cb1cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 20:48:29 +00:00
Treehugger Robot
4241cc5b9e Merge "c2a: add option to use Cargo.toml.orig" am: 1da99cc99e am: 8a02c886f1 am: 30d11fa9d6 am: c9c1fbdd18 am: c5e8ab9a80
Original change: https://android-review.googlesource.com/c/platform/development/+/2135133

Change-Id: I2e4874c61309b77a98148e42495575ba424d2896
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 20:43:42 +00:00
Anton Hansson
03d4fedca7 Merge "Dist merged system annotation zip" am: 6c8cfa3386 am: 3a18655006 am: 73e60a237e am: a0d2f8f91d am: 81422e4bce
Original change: https://android-review.googlesource.com/c/platform/development/+/2135132

Change-Id: I07a581d91407aa2deba4f22c27650923300338eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 20:16:01 +00:00
Mu-Le Lee
4d7c3e3dc5 Merge "Remove location information of unnamed elements in dumps to avoid automerge conflict." am: aa22b20007 am: 54447f3246 am: 4841d51f3a am: 3e5585e896
Original change: https://android-review.googlesource.com/c/platform/development/+/2136214

Change-Id: I607d2a090d40f9d55c52d1d8ad2770e46ff35d17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 20:12:28 +00:00
Treehugger Robot
c5e8ab9a80 Merge "c2a: add option to use Cargo.toml.orig" am: 1da99cc99e am: 8a02c886f1 am: 30d11fa9d6 am: c9c1fbdd18
Original change: https://android-review.googlesource.com/c/platform/development/+/2135133

Change-Id: I5623216acb3a72405c9e5fc5d80777d33527ba10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 20:11:09 +00:00
Anton Hansson
81422e4bce Merge "Dist merged system annotation zip" am: 6c8cfa3386 am: 3a18655006 am: 73e60a237e am: a0d2f8f91d
Original change: https://android-review.googlesource.com/c/platform/development/+/2135132

Change-Id: I2468567cbfe69498129d6e0ad2fe087171f57d16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 20:01:21 +00:00
Hongwei Wang
8d408e82c1 Add ability to enter PiP on back pressed in ApiDemos
Bug: 235268241
Test: Press back when in com.example.android.apis/.app.PictureInPicture
Change-Id: I8ceaaf3b1215505bd4919ef5f5da291df62c1049
2022-06-27 11:27:03 -07:00
Mu-Le Lee
3e5585e896 Merge "Remove location information of unnamed elements in dumps to avoid automerge conflict." am: aa22b20007 am: 54447f3246 am: 4841d51f3a
Original change: https://android-review.googlesource.com/c/platform/development/+/2136214

Change-Id: I4865cc71310d059c65a0919b28b3100fa0b97d3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 06:40:49 +00:00
Mu-Le Lee
4841d51f3a Merge "Remove location information of unnamed elements in dumps to avoid automerge conflict." am: aa22b20007 am: 54447f3246
Original change: https://android-review.googlesource.com/c/platform/development/+/2136214

Change-Id: I7a25c758749f334dd51d5dac2438c68a5467bec0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 06:22:46 +00:00
Mu-Le Lee
54447f3246 Merge "Remove location information of unnamed elements in dumps to avoid automerge conflict." am: aa22b20007
Original change: https://android-review.googlesource.com/c/platform/development/+/2136214

Change-Id: I84fe081ed2177c8ad2c05c742083c8f5f2133d6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 06:06:01 +00:00
Mu-Le Lee
aa22b20007 Merge "Remove location information of unnamed elements in dumps to avoid automerge conflict." 2022-06-27 05:25:47 +00:00
Mu-Le Lee
b55856ae03 Remove location information of unnamed elements in dumps to avoid automerge conflict.
Test: ANDROID_BUILD_TOP=`realpath .` \
      PATH=$PATH:`realpath out/soong/dist/bin`:`realpath out/soong/host/linux-x86/bin` \
      development/vndk/tools/header-checker/tests/test.py
Bug: 236800109
Change-Id: I811d9508166f11f7e69ccbc554bcac8b1f122be6
2022-06-27 03:48:03 +00:00
Treehugger Robot
c9c1fbdd18 Merge "c2a: add option to use Cargo.toml.orig" am: 1da99cc99e am: 8a02c886f1 am: 30d11fa9d6
Original change: https://android-review.googlesource.com/c/platform/development/+/2135133

Change-Id: Ifad0fba555aa1e5b4414669302342bac1c130d4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 20:12:52 +00:00
Anton Hansson
a0d2f8f91d Merge "Dist merged system annotation zip" am: 6c8cfa3386 am: 3a18655006 am: 73e60a237e
Original change: https://android-review.googlesource.com/c/platform/development/+/2135132

Change-Id: I5960b60f3ed7b15a1f5e783e3622151082857af7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 20:01:51 +00:00
Treehugger Robot
30d11fa9d6 Merge "c2a: add option to use Cargo.toml.orig" am: 1da99cc99e am: 8a02c886f1
Original change: https://android-review.googlesource.com/c/platform/development/+/2135133

Change-Id: Id6136530e710f10027daf81bd03e7378a2978bdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 19:47:15 +00:00
Anton Hansson
73e60a237e Merge "Dist merged system annotation zip" am: 6c8cfa3386 am: 3a18655006
Original change: https://android-review.googlesource.com/c/platform/development/+/2135132

Change-Id: I821845373321b77c7c99d46709dc76ea3fc44780
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 19:36:58 +00:00
Treehugger Robot
8a02c886f1 Merge "c2a: add option to use Cargo.toml.orig" am: 1da99cc99e
Original change: https://android-review.googlesource.com/c/platform/development/+/2135133

Change-Id: Id4db0018932c7a2ac9784df08b2c15e4098dcb79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 19:15:53 +00:00
Anton Hansson
3a18655006 Merge "Dist merged system annotation zip" am: 6c8cfa3386
Original change: https://android-review.googlesource.com/c/platform/development/+/2135132

Change-Id: Id5feedb84b5be4969f11aa734c82f6b310dc0791
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 19:13:47 +00:00
Treehugger Robot
1da99cc99e Merge "c2a: add option to use Cargo.toml.orig" 2022-06-23 15:34:41 +00:00
Anton Hansson
6c8cfa3386 Merge "Dist merged system annotation zip" 2022-06-23 15:07:10 +00:00
Jeff Vander Stoep
2adbd7ed89 c2a: add option to use Cargo.toml.orig
`Cargo --publish` strips dev-dependencies from Cargo.toml, an issue
that won't be fixed until [1] is resolved, which doesn't seem
likely as it has been open for ~5 years now.

cargo2android needs dev-dependencies listed in Cargo.toml in order
to generate the rust_test in Android.bp, add an option that tells
cargo2android to use the cargo.toml.orig instead of the cargo.toml.

With this change there are now two options that temporarily
update Cargo.toml, so I've pulled these out into a separate class
to clean up the code a bit.

[1] https://github.com/rust-lang/cargo/issues/4242

Test: run against projects with --add_workspace and
--orig-cargo-toml

Change-Id: I3b8633a807c9734981ebde0bef9b73868acf6774
2022-06-23 16:38:08 +02:00
Hui Ling Shi
7b1212ee06 Merge "[2] Add IME processing for ADB-captured traces" 2022-06-23 10:56:50 +00:00
Anton Hansson
8e63be9278 Dist merged system annotation zip
The system-data/annotations.zip was previously generated
by the monolithic system sdk rule. Migrate it over to the
newly introduced modularized/merged target.

Bug: 235140934
Test: m sdk dist && ls out/dist/system-data | grep annotations
Change-Id: I1afc4ef7fdf87555adecdb11296bc07d25193ca2
2022-06-23 10:14:39 +00:00