Commit Graph

33510 Commits

Author SHA1 Message Date
Matthew Maurer
627ff7d85a Merge "rust: addr3prf: Support COPYING files" am: a2fff95476 am: 5584fd7393 am: 9d224221ac am: 7f1c02853c am: da4757c107
Original change: https://android-review.googlesource.com/c/platform/development/+/2182815

Change-Id: Ic5434aa41c86abc6a12645995447fb3849b58869
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11 19:12:20 +00:00
Matthew Maurer
da4757c107 Merge "rust: addr3prf: Support COPYING files" am: a2fff95476 am: 5584fd7393 am: 9d224221ac am: 7f1c02853c
Original change: https://android-review.googlesource.com/c/platform/development/+/2182815

Change-Id: I051950faa153a278c2873c0ec21dff21759445b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11 18:36:52 +00:00
Matthew Maurer
7f1c02853c Merge "rust: addr3prf: Support COPYING files" am: a2fff95476 am: 5584fd7393 am: 9d224221ac
Original change: https://android-review.googlesource.com/c/platform/development/+/2182815

Change-Id: Ic289609093e5e3d302cf3fca233f656ff3fd79ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11 18:21:15 +00:00
Matthew Maurer
9d224221ac Merge "rust: addr3prf: Support COPYING files" am: a2fff95476 am: 5584fd7393
Original change: https://android-review.googlesource.com/c/platform/development/+/2182815

Change-Id: I650241724545ea11134a88239691e89f306650bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11 17:32:41 +00:00
Matthew Maurer
5584fd7393 Merge "rust: addr3prf: Support COPYING files" am: a2fff95476
Original change: https://android-review.googlesource.com/c/platform/development/+/2182815

Change-Id: I45d9882d7382e13ec7d6838b7b878aed3efa2945
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11 17:06:42 +00:00
Matthew Maurer
a2fff95476 Merge "rust: addr3prf: Support COPYING files" 2022-08-11 16:52:28 +00:00
Matthew Maurer
51ec016f76 rust: addr3prf: Support COPYING files
Previously, we only looked for LICENSE* files. This adds support for
detecting COPYING* files as an alternate representation of the license.

Bug: 234563254
Test: get_rust_pkg.py -add3prf quiche
Change-Id: Ic04ef42f349879be18a4307bd863288dfa81b5fc
2022-08-10 15:29:24 -07:00
Kean Mariotti
fce1e58e06 Merge changes from topic "traces-with-realtime"
* changes:
  add support for traces real timestamp
  refactor test code
  refactor Parser's interface
  parser for new screen recording metadata
2022-08-10 16:27:43 +00:00
Inseob Kim
d0813ac165 Merge "Add multitree sample build script" am: ea3c580c00 am: 99b62ffe4e am: d2c7c791b3 am: 32cc701518 am: d0c865c9d9
Original change: https://android-review.googlesource.com/c/platform/development/+/2179374

Change-Id: I50ce7a4b17feaa3562094285440069579a88f4ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10 09:11:48 +00:00
Inseob Kim
d0c865c9d9 Merge "Add multitree sample build script" am: ea3c580c00 am: 99b62ffe4e am: d2c7c791b3 am: 32cc701518
Original change: https://android-review.googlesource.com/c/platform/development/+/2179374

Change-Id: Idd4b6c92ec8f8bb68fd73baf0a9630abb688cf74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10 07:58:44 +00:00
Inseob Kim
32cc701518 Merge "Add multitree sample build script" am: ea3c580c00 am: 99b62ffe4e am: d2c7c791b3
Original change: https://android-review.googlesource.com/c/platform/development/+/2179374

Change-Id: I7532518ebec8c8efb95788333db96af4bd9af189
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10 07:32:52 +00:00
Inseob Kim
d2c7c791b3 Merge "Add multitree sample build script" am: ea3c580c00 am: 99b62ffe4e
Original change: https://android-review.googlesource.com/c/platform/development/+/2179374

Change-Id: I5ecd9ca7059936d9eff95da6d0839d5ee3ab9ef4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10 07:14:16 +00:00
Inseob Kim
99b62ffe4e Merge "Add multitree sample build script" am: ea3c580c00
Original change: https://android-review.googlesource.com/c/platform/development/+/2179374

Change-Id: Id12670ebc9c220d5cb78e9b33fd348fe5e618982
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10 06:34:40 +00:00
Inseob Kim
ea3c580c00 Merge "Add multitree sample build script" 2022-08-10 06:14:39 +00:00
Inseob Kim
2a458f6d14 Add multitree sample build script
Bug: 233327677
Test: manual
Change-Id: Ia83982911606a8cd8fb43d3bce211d5450d2997b
2022-08-10 11:33:26 +09:00
Kean Mariotti
5415b8bf69 add support for traces real timestamp
Parsers support real timestamps (along the legacy elapsed timestamps) for the following trace types:
- Accessibility
- InputMethodClients
- InputMethodManagerService
- InputMethodService
- ProtoLog
- SurfaceFlinger
- Transactions
- WindowManager

Bug: 235196806
Test: cd development/tools/winscope-ng && npm run build:unit && npm run test:unit
Change-Id: Ib26fa7c4b8b4cc0ed3128c6805c57fcb1ce7ae85
2022-08-09 14:03:44 +00:00
Kean Mariotti
31392005c5 refactor test code
- segregate unit and e2e test utils
- add UnitTestUtils::getParser()

Test: cd development/tools/winscope-ng && npm run build:all && npm run test:all
Change-Id: I48212fe9bb1ef01b09301cd8a721f10ea18c9b77
2022-08-09 14:03:44 +00:00
Kean Mariotti
e081cfee6b refactor Parser's interface
- add class TimestampType (ELAPSED or REAL)
- add class Timestamp (timestamp value + type)
- use bigint (instead of number) to represent timestamp values

Test: cd development/tools/winscope-ng && npm run build:all && npm run test:all
Change-Id: I1db9f2f9d48ca54bd79d3ffb989f6dde9ac11cd7
2022-08-09 14:03:44 +00:00
Kean Mariotti
75862f22be parser for new screen recording metadata
Bug: 235196806
Test: cd development/tools/winscope-ng && npm run build:unit && npm run test:unit
Change-Id: Ie964b30f2f88a35ce428fab9fe1da192599da6e5
2022-08-09 14:03:44 +00:00
Pablo Gamito
99a2ff31bc Merge "Compile FaaS common config package for Winscope" 2022-08-08 09:08:46 +00:00
TreeHugger Robot
aa7f6c51ab Merge "Add fields to WM&SF Properties panel for Ime IMMS" 2022-08-05 17:25:24 +00:00
Hui Ling Shi
07cb2b6e55 Merge "Add specific values for testing IME processing" 2022-08-04 18:30:10 +00:00
Hui Ling Shi
cba772e665 Add fields to WM&SF Properties panel for Ime IMMS
Add windowContainer > identifier > title property for imeControlTarget,
imeInputTarget and imeLayeringTarget, which are extracted from WM trace,
into the WM&SF Properties panel for ImeTrace InputMethodManagerService.

Also, change the titles of 'IME...Target' properties into clickable
text (originally, the clickable text was in the right column).

Screenshot: https://screenshot.googleplex.com/BWZFJgca2YmXk6X.png
Bug: 236226833
Test: manual on local build of Winscope
Change-Id: I8da832fa36c722688c73a16d5381d7ef49fbfb0e
2022-08-04 12:56:46 +00:00
Hui Ling Shi
f6593124e5 Add specific values for testing IME processing
Previous CL ag/19516273 added tests for the new logic in
ime_processing.js, which extracts properties from WM & SF trace
entries and combines them into IME trace entries. However, the
checks used in the tests were a bit vague as they just expected some
fields to be defined (non-null). This CL improves on this by specifying
some values to verify the extracted WM / SF fields' correctness.

Bug: 237744706
Test: yarn run test
Change-Id: I1f237135520f0ef5dc85b257f6602196aa534197
2022-08-04 12:29:03 +00:00
Pablo Gamito
c2f4bc4b8c Compile FaaS common config package for Winscope
Test: yarn run v1.22.18
info Visit https://yarnpkg.com/en/docs/cli/run for documentation about this command.

Bug: 241061291
Change-Id: I109aa17a607ee6cd5978f4af4c51dc49a67f5d98
2022-08-04 11:06:38 +00:00
Hui Ling Shi
c5e77fd12f Merge changes If2a053c4,Ic9e8f6e7,I0782ec52,I2a2747b5,If067cf73
* changes:
  Add tests for combining IME with WM / SF entries
  Fix SFLayer TypeErrors in Winscope
  [11] Change matching WM/SF entry to IME entry algo
  [10] Refine WM & SF Properties IME subpanel
  [9] Fix null targets in IME's 'WM & SF Properties'
2022-08-04 04:02:53 +00:00
Hui Ling Shi
df557d595f Add tests for combining IME with WM / SF entries
Add tests for the new logic in ime_processing.js, which extracts
properties from WindowManager and SurfaceFlinger trace entries and
combines them into IME trace entries.

Some simple IME, WM and SF traces are added into
spec/traces/ime_processing_traces, and the results of combining them are
asserted for in spec/ImeProcessingSpec.js.

Bug: 237744706
Test: yarn run test
Change-Id: If2a053c4885cc4c522c93cf747b94cb69aceb1c6
2022-08-03 12:06:16 +00:00
Treehugger Robot
f722d4a26a Merge "Fix the incorrect prebuilts-info in aosp-master-boot" am: 9428c27824 am: fc8e1abc67 am: 94092b5c2a am: eb009ffec1 am: 05d874064e
Original change: https://android-review.googlesource.com/c/platform/development/+/2168326

Change-Id: I10d98c9e3c16aa2d610e1a9cb6d0d265afd21bec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 09:36:05 +00:00
Treehugger Robot
05d874064e Merge "Fix the incorrect prebuilts-info in aosp-master-boot" am: 9428c27824 am: fc8e1abc67 am: 94092b5c2a am: eb009ffec1
Original change: https://android-review.googlesource.com/c/platform/development/+/2168326

Change-Id: Id19689b211a77f14e10c7426dac518b1ca2454d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 09:18:28 +00:00
Treehugger Robot
eb009ffec1 Merge "Fix the incorrect prebuilts-info in aosp-master-boot" am: 9428c27824 am: fc8e1abc67 am: 94092b5c2a
Original change: https://android-review.googlesource.com/c/platform/development/+/2168326

Change-Id: Ia02c8aa3bf7a5bd4cae3917f877cbe4266800a00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 08:51:46 +00:00
Treehugger Robot
94092b5c2a Merge "Fix the incorrect prebuilts-info in aosp-master-boot" am: 9428c27824 am: fc8e1abc67
Original change: https://android-review.googlesource.com/c/platform/development/+/2168326

Change-Id: Ibba4c0028ffe5732b2f038f891fcee9c038e4745
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 08:27:53 +00:00
Treehugger Robot
fc8e1abc67 Merge "Fix the incorrect prebuilts-info in aosp-master-boot" am: 9428c27824
Original change: https://android-review.googlesource.com/c/platform/development/+/2168326

Change-Id: Ida5e332f83e60d6f3c427e4c85718a031f2b76b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 08:08:07 +00:00
Treehugger Robot
9428c27824 Merge "Fix the incorrect prebuilts-info in aosp-master-boot" 2022-08-02 07:44:25 +00:00
Howard Chen
8013679744 Fix the incorrect prebuilts-info in aosp-master-boot
Bug: 241050793
Test: \
    development/gsi/build_with_kernel/repack_kernels.sh aarch64 \
    development/gsi/build_with_kernel/update_kernel_prebuilts_510_arm64.sh \
    development/gsi/build_with_kernel/update_kernel_prebuilts_515_arm64.sh \
    build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=gki_arm64 TARGET_BUILD_VARIANT=user DIST_DIR=%dist_dir% droid dist \
    development/gsi/build_with_kernel/kernel_info_to_dist.sh aarch64

Change-Id: I6ee2e6a5dfbc4e3105bfcdf7191dd306edb59b4c
2022-08-02 14:28:18 +08:00
Hui Ling Shi
8a507b7a54 Fix SFLayer TypeErrors in Winscope
Fix the errors that pop up when clicking `SurfaceFlingerLayer` in
SurfaceFlingerTrace panel's Hierarchy panel, by taking care of cases
where the property is null.

Bug: 240405932
Test: manual on local build of Winscope
Change-Id: Ic9e8f6e75dcfde8af97aeb5254d1e2d8f7b3d669
2022-08-01 08:46:45 +00:00
Hui Ling Shi
595c67d790 [11] Change matching WM/SF entry to IME entry algo
Due to there being some slightly different timestamps between WM/SF
trace and IME trace, we want to allow some "fault tolerance" -- even
if a WM/SF entry comes after IME entry in time, it may still be the
corresponding entry if it's within a manually-defined "fault tolerance"
time.

For now, fault tolerance is defined to be 200ms. So if a WM/SF entry is
within IME entry +- 200ms, it may be considered a matching /
corresponding entry. Within this range, we will always try to pick a
WM/SF entry that comes before the IME entry. If there is no such WM/SF
entry, then we will pick one that comes after.

Bug: 236226833
Test: manual on local build of Winscope
Change-Id: I0782ec520284517bf964eeffd552e6175758c9f1
2022-08-01 08:46:43 +00:00
Hui Ling Shi
948c897065 [10] Refine WM & SF Properties IME subpanel
Make the following headers clickable; upon clicking, will show proto
details in the 'Properties' sub-panel on the right:
- WMState
- Ime Container
- Input Method Surface
- IME Insets Source Provider

Add the following properties:
- Focused window's color / rgba information -- focused window title
  extracted from WM trace, the corresponding surface's rgba extracted
  from SF trace
- InputMethod Window's visibility
- InputMethod Surface's visibility
- InputMethod Surface's rect & screenBounds

Remove the following properties:
- ImeContainer's rect & screenBounds

Rename the following properties:
- Frame (under 'Focus' heading) --> Input Control Target Frame

Screenshots: in buganizer ticket
Bug: 236226833
Test: manual on local build of winscope

Change-Id: I2a2747b57639f40c8f6bf71d5cb49268e4ee5044
2022-08-01 08:45:24 +00:00
Hui Ling Shi
cb0d23d9dd [9] Fix null targets in IME's 'WM & SF Properties'
Fix incorrect names of properties being extracted from WM Trace:
- 'Input Method Control Target' has been replaced with 'IME Control
Target', 'Input Method Input Target' with 'IME Input Target', and 'Input
Method Target' with 'IME Layering Target'.

Bug: 239145867
Test: manual on local build of winscope
Change-Id: If067cf73de32d4374b33d1f07f179b63c9fb0c27
2022-08-01 08:34:36 +00:00
Priyanka Patel
8181e2a221 Merge changes from topic "Trace Collection"
* changes:
  Add component tests and an upload card.
  Adding ability to run and end traces via proxy.
  Refactor code to use common connection.
  Migration of proxy.
  trace collection UI
2022-07-29 12:43:21 +00:00
Priyanka Patel
c40abfeb90 Add component tests and an upload card.
Adding component spec tests for all new components involved in trace
collection. This includes a new card for this CL, UploadTracesComponent,
to make testing more methodical.

Test: npm run test:component
Bug: b/238981126

Change-Id: I46d1b24fed84ce35432dad36fd5ac24d35cd0542
2022-07-29 11:36:25 +00:00
Priyanka Patel
64b08efa13 Adding ability to run and end traces via proxy.
Finishing proxy migration by creating functionality to run and end
traces and dumps after selecting trace config.

Test: Connect a device via remote device proxy and follow the proxy
workflow for a trace or dump. Should see a placeholder message saying data loaded (trace
views not yet created).

Bug: b/238113543
Change-Id: Ic7e0948341511f6ec0bf1021d2ffbb7b198c9410
2022-07-29 10:52:13 +00:00
Priyanka Patel
b6ee5d4794 Refactor code to use common connection.
None of the components should directly interact with the proxy because
non-android development workflow (using web adb) will also be possible
in the future. Instead the ui components interact with a common
connection interface which handles the proxy or web adb respectively.

Test: check that proxy workflow still works as expected.

Bug: b/234103636
Change-Id: I0e7bbaf4b5f342ca99dd67f890c135dbf3ef61ec
2022-07-29 10:50:31 +00:00
Priyanka Patel
88ea98f6ba Migration of proxy.
Migrating the proxy to the new trace collection UI. Should be able to
enter the proxy token, select your connected device and then make
changes to trace configrurations.

Test: try running the proxy and test that functionality is same as old
winscope.

Bug: b/238113543
Change-Id: I195f65df5d09e22db54cb9f5a7ba0396948f43d3
2022-07-29 10:50:12 +00:00
Priyanka Patel
b91e72bf40 trace collection UI
Created new UI components for trace collection. Since the proxy is not
yet migrated, click through the buttons to automatically cycle through
the components.

Bug: b/238981126

Test: npm run start
Click Web ADB tab to see basic component. Click ADB proxy tab to see
proxy component. Click Retry to get to authorisation options. Click
Connect to get to trace configuration component.

Change-Id: I1e7a9895ece06856c095d8c85c28d22bbfa94b31
2022-07-29 10:49:44 +00:00
Treehugger Robot
21e05b2c1d Merge "Fix license_collector" am: e32fd5baaa am: 3d35ced879 am: 7012f00472 am: 8bbdf758b2 am: a1007c3e09
Original change: https://android-review.googlesource.com/c/platform/development/+/2168323

Change-Id: I2805f3d1ac9cd9afcd48c3210e635dd61028a9cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 09:54:35 +00:00
Treehugger Robot
a1007c3e09 Merge "Fix license_collector" am: e32fd5baaa am: 3d35ced879 am: 7012f00472 am: 8bbdf758b2
Original change: https://android-review.googlesource.com/c/platform/development/+/2168323

Change-Id: I9cefa3e8ad1e8593f0849ce3009b75e2f5ec1032
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 09:31:04 +00:00
Treehugger Robot
8bbdf758b2 Merge "Fix license_collector" am: e32fd5baaa am: 3d35ced879 am: 7012f00472
Original change: https://android-review.googlesource.com/c/platform/development/+/2168323

Change-Id: Ic36c2eb270ea47c35b54d17739c71218f7dd5282
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 09:07:41 +00:00
Treehugger Robot
7012f00472 Merge "Fix license_collector" am: e32fd5baaa am: 3d35ced879
Original change: https://android-review.googlesource.com/c/platform/development/+/2168323

Change-Id: I0e5677ed10b3f855284f6e25278a26951b0d4968
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 08:42:40 +00:00
Treehugger Robot
3d35ced879 Merge "Fix license_collector" am: e32fd5baaa
Original change: https://android-review.googlesource.com/c/platform/development/+/2168323

Change-Id: I93e1094c97f7f8fc278be876d2b35a68660e9dee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 07:46:24 +00:00
Treehugger Robot
e32fd5baaa Merge "Fix license_collector" 2022-07-29 07:21:46 +00:00