Commit Graph

33566 Commits

Author SHA1 Message Date
TreeHugger Robot
ef46381c91 Merge changes from topic "Rects"
* changes:
  (Rects View Review Changes) Create SF viewer.
  Create Viewer for surface flinger traces.
2022-08-17 17:31:29 +00:00
Mu-Le Lee
06b69c180f Merge "Change the format of header-abi-diff config from .ini to .json" am: e43c2bc9a7 am: 1997b594d6 am: 2af8de3972 am: 807bfe9ef1 am: 61eaa2bfcf
Original change: https://android-review.googlesource.com/c/platform/development/+/2176545

Change-Id: I7d46d1bfa9a170b646733adfdf39e20a75285d42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 16:40:29 +00:00
Automerger Merge Worker
13d7274d65 [automerger skipped] Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into stage-aosp-master am: cf3ad91aae -s ours am: 5dfccffb3c -s ours am: 7edbd525a5 -s ours am: b70eae494c -s ours
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history

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

Change-Id: Ia3a2aa0e4c60c8c9073135a93d271b6c48c0386b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 16:01:47 +00:00
Xin Li
962e1835ed [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 4ce806fe1b -s ours am: 4392c82f8e -s ours am: 1b2a51e7ff -s ours am: c18594cce8 -s ours am: 4933be9baa -s ours
am skip reason: subject contains skip directive

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

Change-Id: I128e009be1ffad7cb29a1a51d58c1ba99722dfd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 16:01:17 +00:00
Xin Li
7354802774 [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 4ce806fe1b -s ours am: 7f7c44d6ca -s ours am: 1f110f2cf3 -s ours am: b7c85f9190 -s ours am: eea6db0f4a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic6ad51d8b000c5834b2622b2f0b232b2b9efe8a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 15:44:50 +00:00
Xin Li
53e4869503 [automerger skipped] DO NOT MERGE - Merge Android 13 am: aa167d631e -s ours am: f2ea94b3a9 -s ours am: c01cc4e72e -s ours am: a4dd59c63d -s ours am: 1a6d113561 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I60b2a4e64269b1bc6ce2f9e203dc1d8c86a6bd6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 15:44:20 +00:00
Priyanka Patel
c1541c1bd4 (Rects View Review Changes) Create SF viewer.
Review changes for ag/19482843 (in separate CL as requested).

Bug: b/238089034
Test: npm run test:all
Change-Id: I9d2f99090f2e2125271b702c8a1dc409f112b776
2022-08-17 09:31:14 +00:00
Nataniel Borges
ddd26365a5 Merge "Fix kotlinjs path" 2022-08-17 09:25:40 +00:00
Mu-Le Lee
61eaa2bfcf Merge "Change the format of header-abi-diff config from .ini to .json" am: e43c2bc9a7 am: 1997b594d6 am: 2af8de3972 am: 807bfe9ef1
Original change: https://android-review.googlesource.com/c/platform/development/+/2176545

Change-Id: I6e99df7675b76c5056ca5ddbb91cf568f0b211ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 07:42:55 +00:00
Mu-Le Lee
807bfe9ef1 Merge "Change the format of header-abi-diff config from .ini to .json" am: e43c2bc9a7 am: 1997b594d6 am: 2af8de3972
Original change: https://android-review.googlesource.com/c/platform/development/+/2176545

Change-Id: Icb8d9d4d69ee8d79f6f27f7c241737643c08d5da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 07:24:29 +00:00
Mu-Le Lee
2af8de3972 Merge "Change the format of header-abi-diff config from .ini to .json" am: e43c2bc9a7 am: 1997b594d6
Original change: https://android-review.googlesource.com/c/platform/development/+/2176545

Change-Id: I6b97bbb31b9171d2b6f1fbc7a4f50c821f042b00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 06:54:26 +00:00
Mu-Le Lee
1997b594d6 Merge "Change the format of header-abi-diff config from .ini to .json" am: e43c2bc9a7
Original change: https://android-review.googlesource.com/c/platform/development/+/2176545

Change-Id: I41ea447c0c56dbd4ec8123c579fa103f39964dad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 06:21:43 +00:00
Mu-Le Lee
e43c2bc9a7 Merge "Change the format of header-abi-diff config from .ini to .json" 2022-08-17 05:58:15 +00:00
Automerger Merge Worker
b70eae494c [automerger skipped] Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into stage-aosp-master am: cf3ad91aae -s ours am: 5dfccffb3c -s ours am: 7edbd525a5 -s ours
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history

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

Change-Id: I24f3dd1936e0aea66c740477aa47f3d3ad00b326
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 01:10:03 +00:00
Xin Li
4933be9baa [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 4ce806fe1b -s ours am: 4392c82f8e -s ours am: 1b2a51e7ff -s ours am: c18594cce8 -s ours
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history

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

Change-Id: I033fb1d5cea6daa77e25a2a6161f2f334cb2b2e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 01:09:34 +00:00
Automerger Merge Worker
7edbd525a5 [automerger skipped] Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into stage-aosp-master am: cf3ad91aae -s ours am: 5dfccffb3c -s ours
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history

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

Change-Id: I786a0bb017b1d4aa3d28b853c3f2651c90a9567d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 00:55:34 +00:00
Xin Li
c18594cce8 [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 4ce806fe1b -s ours am: 4392c82f8e -s ours am: 1b2a51e7ff -s ours
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history

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

Change-Id: I07cc9965afc8a6205c820dbd0e03c8ff7be35391
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 00:55:06 +00:00
Xin Li
eea6db0f4a [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 4ce806fe1b -s ours am: 7f7c44d6ca -s ours am: 1f110f2cf3 -s ours am: b7c85f9190 -s ours
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history

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

Change-Id: Id3413be10facb32f79170c59cab405555cdc4aa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 00:50:38 +00:00
Xin Li
1a6d113561 [automerger skipped] DO NOT MERGE - Merge Android 13 am: aa167d631e -s ours am: f2ea94b3a9 -s ours am: c01cc4e72e -s ours am: a4dd59c63d -s ours
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history

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

Change-Id: I8192ecf1182b5b0a073aee0f089a56015442f4f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 00:50:05 +00:00
Automerger Merge Worker
5dfccffb3c Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into stage-aosp-master am: cf3ad91aae -s ours
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history

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

Change-Id: I11c61bc48ec60decaf1b855e609f203873df5e28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 00:29:57 +00:00
Xin Li
1b2a51e7ff [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 4ce806fe1b -s ours am: 4392c82f8e -s ours
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history

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

Change-Id: I2b5258ea4a20ad271cb1375f861589441363e014
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 00:29:30 +00:00
Xin Li
b7c85f9190 [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 4ce806fe1b -s ours am: 7f7c44d6ca -s ours am: 1f110f2cf3 -s ours
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history

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

Change-Id: I215d6820b030632664be6db8585afdb98abe97df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 00:26:18 +00:00
Xin Li
a4dd59c63d [automerger skipped] DO NOT MERGE - Merge Android 13 am: aa167d631e -s ours am: f2ea94b3a9 -s ours am: c01cc4e72e -s ours
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history

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

Change-Id: Ic1d190f2cae1cd9b9fe9dbbbe4e8d9725498a62d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 00:25:51 +00:00
Xin Li
1f110f2cf3 [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 4ce806fe1b -s ours am: 7f7c44d6ca -s ours
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history

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

Change-Id: I6dccdba8809fa18c842ed89e1dbec9865b021e00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 00:00:20 +00:00
Xin Li
c01cc4e72e [automerger skipped] DO NOT MERGE - Merge Android 13 am: aa167d631e -s ours am: f2ea94b3a9 -s ours
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history

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

Change-Id: If81c8b32b8ee865e8f6276e15d5aa91d0ecc66c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 23:59:49 +00:00
Automerger Merge Worker
cf3ad91aae Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into stage-aosp-master
* changes:
  [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 4ce806fe1b -s ours
  [automerger skipped] DO NOT MERGE - Merge Android 13 am: aa167d631e -s ours
2022-08-16 23:43:03 +00:00
Xin Li
4392c82f8e [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 4ce806fe1b -s ours
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history

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

Change-Id: I131c41a522f76f5e882740a2a2919f0cdc844c95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 23:40:15 +00:00
Xin Li
b6f1bde694 [automerger skipped] DO NOT MERGE - Merge Android 13 am: aa167d631e -s ours
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history

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

Change-Id: I620e778713628d311f5afc77748b638a9daffe4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 23:39:45 +00:00
Xin Li
7f7c44d6ca [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 4ce806fe1b -s ours
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history

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

Change-Id: Iae99cc2ad02a8eaf997200f93de1f4525afa2d44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 23:37:51 +00:00
Xin Li
f2ea94b3a9 [automerger skipped] DO NOT MERGE - Merge Android 13 am: aa167d631e -s ours
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history

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

Change-Id: I2725c3ee80866631a44553f9859e484509d34033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 23:37:20 +00:00
Xin Li
4ce806fe1b Merge "DO NOT MERGE - Merge Android 13" 2022-08-16 19:08:16 +00:00
Treehugger Robot
f25367c345 Merge "Bumping package version number for T. Test: treehugger Bug: 242625850" am: ddbf515da8 am: 39d748b0ae am: ae366e4eb9 am: d0b00316f7 am: b083fa9a75
Original change: https://android-review.googlesource.com/c/platform/development/+/2186580

Change-Id: I4029fcb0777413f9f0c9db6a53bcd10688f50e55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 09:05:42 +00:00
Treehugger Robot
b083fa9a75 Merge "Bumping package version number for T. Test: treehugger Bug: 242625850" am: ddbf515da8 am: 39d748b0ae am: ae366e4eb9 am: d0b00316f7
Original change: https://android-review.googlesource.com/c/platform/development/+/2186580

Change-Id: Idec11305fc3a57cec8aab9a34e8d55fdb3e53645
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 07:12:36 +00:00
Treehugger Robot
d0b00316f7 Merge "Bumping package version number for T. Test: treehugger Bug: 242625850" am: ddbf515da8 am: 39d748b0ae am: ae366e4eb9
Original change: https://android-review.googlesource.com/c/platform/development/+/2186580

Change-Id: Ifee5a68951200424c8d4a40a3f1ac57ab92d2879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 06:46:47 +00:00
Nataniel Borges
72e22465d8 Merge "Compatibilize winscope with new flicker layer ctor" 2022-08-16 06:25:31 +00:00
Treehugger Robot
ae366e4eb9 Merge "Bumping package version number for T. Test: treehugger Bug: 242625850" am: ddbf515da8 am: 39d748b0ae
Original change: https://android-review.googlesource.com/c/platform/development/+/2186580

Change-Id: I11174122c13ac60b2c031d1b13fccda2b0450c65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 05:50:20 +00:00
Treehugger Robot
39d748b0ae Merge "Bumping package version number for T. Test: treehugger Bug: 242625850" am: ddbf515da8
Original change: https://android-review.googlesource.com/c/platform/development/+/2186580

Change-Id: I4fc8a98e2ca40e081cbdd77e43631ce5ea7fe9ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 05:04:00 +00:00
Xin Li
aa167d631e DO NOT MERGE - Merge Android 13
Bug: 242648940
Merged-In: Ib270c83d4f18dc7e301667733df8952f83581116
Change-Id: I196fa21c8487e0f57ab3d8a4761e149fe407f083
2022-08-15 21:59:27 -07:00
Treehugger Robot
ddbf515da8 Merge "Bumping package version number for T. Test: treehugger Bug: 242625850" 2022-08-16 04:36:55 +00:00
Shaju Mathew
6e77cfb32b Bumping package version number for T.
Test: treehugger
Bug: 242625850

Signed-off-by: Shaju Mathew <shaju@google.com>
Change-Id: I5f52e907afdbfed6943f97e11c612e1efbd244d1
2022-08-16 02:57:18 +00:00
Priyanka Patel
43cf6c1dd2 Create Viewer for surface flinger traces.
Created the viewer component for SF traces, including rects view,
properties view, hierarchy view (for re-use in other apps). Designed
rects view using three.js. Created reusable trace view and trace view
header components for Winscope only. CL also contains basic time scrub (created here to aid in testing rects view). Tests have been written for new components.
e2e test added for viewer_surface_flinger.ts. Specs tests written for
other new files.

Bug: b/238089034
Test: npm run test:all, also upload trace_SurfaceFlinger.pb from the test files and click load data. Bug contains a rotation SF trace to see what horizontal rects look like.
Change-Id: Iad79e3b5b6f65c70d69b9a466cf2b785180481c0
2022-08-15 20:08:22 +00:00
Nataniel Borges
b4c799c5af Fix kotlinjs path
This allows us to have correct method and variable names when converting the code to KotlinJs, otherwise the transpiler rewrites all names ot avoid collisions

Bug: 239803858
Test: atest FlickerLibTest && yarn run dev
Change-Id: I165cad5a442752953b3bc511de627dda849f95b7
2022-08-12 15:20:29 +00:00
Priyanka Patel
864e448436 Fixing e2e tests.
Broken e2e test due to changing the way files are uploaded. This should
fix it.

Test: npm run test:e2e
Bug: b/241571689
Change-Id: I74c8d489ecf4c0627d844505037f886d1f183b72
2022-08-12 12:16:40 +00:00
Priyanka Patel
9697901bb3 Merge "Add functionality to upload traces component." 2022-08-12 09:25:44 +00:00
Inseob Kim
2859e2e247 Merge "Export vendor.img and ninja analysis results" am: de0317677b am: 34f24fd47e am: 7da36aa8a4 am: e9ac1f6f17 am: 97edb496b1
Original change: https://android-review.googlesource.com/c/platform/development/+/2183577

Change-Id: Ie633de3a3700494d6cafe7419841e6675c5bec1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 06:31:54 +00:00
Inseob Kim
97edb496b1 Merge "Export vendor.img and ninja analysis results" am: de0317677b am: 34f24fd47e am: 7da36aa8a4 am: e9ac1f6f17
Original change: https://android-review.googlesource.com/c/platform/development/+/2183577

Change-Id: I5868a84bbd17c31552fbe32331dec245a6a31384
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 05:56:59 +00:00
Inseob Kim
e9ac1f6f17 Merge "Export vendor.img and ninja analysis results" am: de0317677b am: 34f24fd47e am: 7da36aa8a4
Original change: https://android-review.googlesource.com/c/platform/development/+/2183577

Change-Id: I8bf6cdd09c271545bf2cc6a1ac90be8af390feed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 05:41:18 +00:00
Inseob Kim
7da36aa8a4 Merge "Export vendor.img and ninja analysis results" am: de0317677b am: 34f24fd47e
Original change: https://android-review.googlesource.com/c/platform/development/+/2183577

Change-Id: Id769354e5e50f2ed938414ed5e884342bdba2011
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 05:24:08 +00:00
Inseob Kim
34f24fd47e Merge "Export vendor.img and ninja analysis results" am: de0317677b
Original change: https://android-review.googlesource.com/c/platform/development/+/2183577

Change-Id: I4434820f626afe78b56a15d678d16d7bc1c5486f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 05:03:53 +00:00
Inseob Kim
de0317677b Merge "Export vendor.img and ninja analysis results" 2022-08-12 04:35:18 +00:00