Commit Graph

33160 Commits

Author SHA1 Message Date
Treehugger Robot
79b73f460b Merge "Fix adb proxy get device id on windows" am: 120f46ef53 am: 5d4f0e7546 am: da6908fec7 am: b8ee00638c am: 846f9658e8
Original change: https://android-review.googlesource.com/c/platform/development/+/2098153

Change-Id: Ie0b8e2ca8add2c727b8cce8739a866a289cbeff2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 16:17:48 +00:00
Treehugger Robot
846f9658e8 Merge "Fix adb proxy get device id on windows" am: 120f46ef53 am: 5d4f0e7546 am: da6908fec7 am: b8ee00638c
Original change: https://android-review.googlesource.com/c/platform/development/+/2098153

Change-Id: I90dbf4a303fe2db63edae6d0a2781cc1ed47de38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 15:58:07 +00:00
Treehugger Robot
b8ee00638c Merge "Fix adb proxy get device id on windows" am: 120f46ef53 am: 5d4f0e7546 am: da6908fec7
Original change: https://android-review.googlesource.com/c/platform/development/+/2098153

Change-Id: I102b0de63473a6f350b0b07dfae4e2a821d6ccdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 15:33:47 +00:00
Treehugger Robot
da6908fec7 Merge "Fix adb proxy get device id on windows" am: 120f46ef53 am: 5d4f0e7546
Original change: https://android-review.googlesource.com/c/platform/development/+/2098153

Change-Id: I519a1541f823739faefa347a97a05525557dd53f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 15:16:00 +00:00
Treehugger Robot
5d4f0e7546 Merge "Fix adb proxy get device id on windows" am: 120f46ef53
Original change: https://android-review.googlesource.com/c/platform/development/+/2098153

Change-Id: I0af71f0dbb26c1dfd0b52aadf6c68ec20bca6c65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 14:57:42 +00:00
Treehugger Robot
120f46ef53 Merge "Fix adb proxy get device id on windows" 2022-05-23 14:42:21 +00:00
Kean Mariotti
111237a5a6 Cleanup test code
Replace multiple ad-hoc Node classes with single builder class

Test: yarn run test
Change-Id: Iebe76c59fbc3bcccdf89885f7d4cdbaa0d6a0576
2022-05-16 15:26:58 +00:00
Kean Mariotti
987d8af036 Merge "Fix Chips missing on SF/WM traces when "Show Diff" toggled" 2022-05-16 06:17:42 +00:00
Kean Mariotti
f0273cd5b4 Fix Chips missing on SF/WM traces when "Show Diff" toggled
Test: yarn run test
Fixes: 231924100
Change-Id: I1923b01e0841282fb27757b5c48ec5b3c76cb24a
2022-05-13 15:09:51 +00:00
zengshuchuan
a7526ac28b Fix adb proxy get device id on windows
Window adb device contains a '\r' character,
translate string to integer comparing.

Bug: 232488036
Test: 1. Excute python.exe winscope_proxy.py on Window Powershell.
2. Launch winscope index.html and set the Winscope token.
3. Tablet connect adb and winscope select the device.
4. Tap the 'DUMP STATE' button.

Change-Id: I8c261da523763982ea4a4bfae6883694b221883c
2022-05-13 16:58:41 +08:00
Anton Hansson
27c135a4d4 Merge "Use lint database from api_versions_public" am: 4f9305a51c am: 0f1b793d59 am: 664f937fc6 am: 68f7aa6ad3 am: 885b041b34
Original change: https://android-review.googlesource.com/c/platform/development/+/2092064

Change-Id: Ib45dab4f016eefc6be804ed917aae8393b1c333b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 04:02:47 +00:00
Anton Hansson
885b041b34 Merge "Use lint database from api_versions_public" am: 4f9305a51c am: 0f1b793d59 am: 664f937fc6 am: 68f7aa6ad3
Original change: https://android-review.googlesource.com/c/platform/development/+/2092064

Change-Id: I3531983dbb1f187f2db1b32c287507b3343cc623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 22:07:40 +00:00
Anton Hansson
68f7aa6ad3 Merge "Use lint database from api_versions_public" am: 4f9305a51c am: 0f1b793d59 am: 664f937fc6
Original change: https://android-review.googlesource.com/c/platform/development/+/2092064

Change-Id: Ibc705ec453ac3a1e5fca0a3b6e3af95cea280d30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:22:27 +00:00
Anton Hansson
664f937fc6 Merge "Use lint database from api_versions_public" am: 4f9305a51c am: 0f1b793d59
Original change: https://android-review.googlesource.com/c/platform/development/+/2092064

Change-Id: I1fa57fb66e062e8ae9c37275fb20b4eb914b195b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:48:08 +00:00
Anton Hansson
0f1b793d59 Merge "Use lint database from api_versions_public" am: 4f9305a51c
Original change: https://android-review.googlesource.com/c/platform/development/+/2092064

Change-Id: Id3b47831f9a0d1a4966b7248c7e8110d9ef902f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:41:59 +00:00
Anton Hansson
4f9305a51c Merge "Use lint database from api_versions_public" 2022-05-11 08:11:45 +00:00
Anton Hansson
1d75c7fe31 Use lint database from api_versions_public
These two databases are (nearly) identical but the latter is generated
in a much more efficient way.

The diffs are very minor and it's not clear to me which versions is more
correct than the other, though I'm fairly confident they don't matter.

https://paste.googleplex.com/5567994005553152

Bug: 187398174
Test: diff api-versions.xml
Change-Id: I97375e0d72675bc8ff102551b3e3913e684be683
2022-05-09 10:46:38 +00:00
Raju Kulkarni
ec4793c7b5 Reset version number for SDK and Build tools with SDK Finalization complete for API Level 33 am: 70032a2eed am: 2540a48f06 am: ecdf034b81 am: d80e64bacf
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/18186516

Change-Id: Ie016f5ec28ea1bc7fb9fcdee7f9583dbaa0fcd75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-08 07:01:28 +00:00
Raju Kulkarni
e83cf596e2 Reset version number for SDK and Build tools with SDK Finalization complete for API Level 33 am: 70032a2eed am: 068f90107c am: 30892421df am: 414ac0ebaa
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/18186516

Change-Id: I3e7ece11ae8a778796aaac82f7fd7242501d92e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-08 07:01:21 +00:00
Raju Kulkarni
8eb93eee26 Reset version number for SDK and Build tools with SDK Finalization complete for API Level 33 am: 70032a2eed am: 2540a48f06 am: 0cd7c6ef49 am: 5f987629af
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/18186516

Change-Id: I2a4c622ef25e9fe6e4fdf7388decedae6d430bbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-08 07:01:12 +00:00
Raju Kulkarni
d80e64bacf Reset version number for SDK and Build tools with SDK Finalization complete for API Level 33 am: 70032a2eed am: 2540a48f06 am: ecdf034b81
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/18186516

Change-Id: If0027fd8e2db2741501109fe03e7082beafbf1ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-08 06:41:56 +00:00
Raju Kulkarni
414ac0ebaa Reset version number for SDK and Build tools with SDK Finalization complete for API Level 33 am: 70032a2eed am: 068f90107c am: 30892421df
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/18186516

Change-Id: I3f90e0447295f37ff1b58a1287a386b916b86aa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-08 06:41:49 +00:00
Raju Kulkarni
5f987629af Reset version number for SDK and Build tools with SDK Finalization complete for API Level 33 am: 70032a2eed am: 2540a48f06 am: 0cd7c6ef49
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/18186516

Change-Id: I866ca07ef36a41eb7dd02384b728ad5ed572ed6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-08 06:41:33 +00:00
Raju Kulkarni
ecdf034b81 Reset version number for SDK and Build tools with SDK Finalization complete for API Level 33 am: 70032a2eed am: 2540a48f06
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/18186516

Change-Id: I696ecc916a7eb63f4404c073fca0b5147a17d3bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-08 06:26:53 +00:00
Raju Kulkarni
30892421df Reset version number for SDK and Build tools with SDK Finalization complete for API Level 33 am: 70032a2eed am: 068f90107c
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/18186516

Change-Id: Ia90dd1644f22728cb9fc2ce62eb134598a13af75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-08 06:26:49 +00:00
Raju Kulkarni
0cd7c6ef49 Reset version number for SDK and Build tools with SDK Finalization complete for API Level 33 am: 70032a2eed am: 2540a48f06
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/18186516

Change-Id: I8df2afb8bc1b8c9fe98f26b5ef9315c3246e56d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-08 06:26:48 +00:00
Raju Kulkarni
405a4a34ad Reset version number for SDK and Build tools with SDK Finalization complete for API Level 33 am: 70032a2eed am: b37ba7153e
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/18186516

Change-Id: I38197b6f5fad0383fc6e46a1182ca97500ddd8f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-08 06:26:23 +00:00
Raju Kulkarni
2540a48f06 Reset version number for SDK and Build tools with SDK Finalization complete for API Level 33 am: 70032a2eed
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/18186516

Change-Id: Ic9498b221f1086dfa17950898da52b66e939cbbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-08 06:03:51 +00:00
Raju Kulkarni
b37ba7153e Reset version number for SDK and Build tools with SDK Finalization complete for API Level 33 am: 70032a2eed
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/18186516

Change-Id: Icebe7c6e47a2da12f9cbc921f7035cd7e2877e8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-08 06:03:01 +00:00
Raju Kulkarni
068f90107c Reset version number for SDK and Build tools with SDK Finalization complete for API Level 33 am: 70032a2eed
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/18186516

Change-Id: I2cdbfa1a465c4bd0b51f5e926c87a2c438565b91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-08 06:02:37 +00:00
Raju Kulkarni
70032a2eed Reset version number for SDK and Build tools with SDK Finalization complete for API Level 33
Bug: 225745567
Change-Id: I9b9f643dbbd31d26ccc3adfb1ea230199aa61c71
Test: N/A
2022-05-08 04:44:26 +00:00
Treehugger Robot
0a45cb35a9 Merge "Bumping package version number for next release Test: N/A Bug: b/230461482 Change-Id: I8b5d925e556e493ab56fa52cedfed7476df46260" am: 430aa3f2a4 am: a830ff7604 am: 4c5cb4d16d am: b372d0da5d am: a52e42cebb
Original change: https://android-review.googlesource.com/c/platform/development/+/2090346

Change-Id: I1f08720620b3003398fd7b45d26e4984357c2f81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 01:59:02 +00:00
Treehugger Robot
a52e42cebb Merge "Bumping package version number for next release Test: N/A Bug: b/230461482 Change-Id: I8b5d925e556e493ab56fa52cedfed7476df46260" am: 430aa3f2a4 am: a830ff7604 am: 4c5cb4d16d am: b372d0da5d
Original change: https://android-review.googlesource.com/c/platform/development/+/2090346

Change-Id: I573bdd7d4c2794bf7ad68e72ee971e17d473a154
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 00:51:03 +00:00
Treehugger Robot
b372d0da5d Merge "Bumping package version number for next release Test: N/A Bug: b/230461482 Change-Id: I8b5d925e556e493ab56fa52cedfed7476df46260" am: 430aa3f2a4 am: a830ff7604 am: 4c5cb4d16d
Original change: https://android-review.googlesource.com/c/platform/development/+/2090346

Change-Id: I42bbb4e64e248f0a0536e361591b4b174fb430a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 00:27:12 +00:00
Treehugger Robot
4c5cb4d16d Merge "Bumping package version number for next release Test: N/A Bug: b/230461482 Change-Id: I8b5d925e556e493ab56fa52cedfed7476df46260" am: 430aa3f2a4 am: a830ff7604
Original change: https://android-review.googlesource.com/c/platform/development/+/2090346

Change-Id: I47d5d67427a9707f872fa2cd64e944d5766c02a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 00:03:03 +00:00
Treehugger Robot
a830ff7604 Merge "Bumping package version number for next release Test: N/A Bug: b/230461482 Change-Id: I8b5d925e556e493ab56fa52cedfed7476df46260" am: 430aa3f2a4
Original change: https://android-review.googlesource.com/c/platform/development/+/2090346

Change-Id: I303503a53c9062fd119f00948d968007e3d687e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 23:21:07 +00:00
Treehugger Robot
430aa3f2a4 Merge "Bumping package version number for next release Test: N/A Bug: b/230461482 Change-Id: I8b5d925e556e493ab56fa52cedfed7476df46260" 2022-05-06 22:54:02 +00:00
Raju Kulkarni
fc22586cb5 Bumping package version number for next release
Test: N/A
Bug: b/230461482
Change-Id: I8b5d925e556e493ab56fa52cedfed7476df46260
2022-05-06 21:36:19 +00:00
Christopher Ferris
84423bca38 Merge "Modify any lines with libc.so!libc.so to libc.so." am: d6ba6d2400 am: 7a20156f00 am: 83cb4bdc01 am: 912a6f4669 am: c32bda9ed0
Original change: https://android-review.googlesource.com/c/platform/development/+/2089004

Change-Id: I09302855a4fff97ca36b939c2a5031dd746b2fdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 03:01:02 +00:00
Christopher Ferris
c32bda9ed0 Merge "Modify any lines with libc.so!libc.so to libc.so." am: d6ba6d2400 am: 7a20156f00 am: 83cb4bdc01 am: 912a6f4669
Original change: https://android-review.googlesource.com/c/platform/development/+/2089004

Change-Id: I71532dc43bc729c650719e2fd63aeaf596c72fd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 02:41:28 +00:00
Christopher Ferris
912a6f4669 Merge "Modify any lines with libc.so!libc.so to libc.so." am: d6ba6d2400 am: 7a20156f00 am: 83cb4bdc01
Original change: https://android-review.googlesource.com/c/platform/development/+/2089004

Change-Id: I4d40a4ab5badf75bd474b393eb33ec2274344e37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 02:25:46 +00:00
Christopher Ferris
83cb4bdc01 Merge "Modify any lines with libc.so!libc.so to libc.so." am: d6ba6d2400 am: 7a20156f00
Original change: https://android-review.googlesource.com/c/platform/development/+/2089004

Change-Id: I633cf0eb6bb6b0312fd6cccc43b6f014b805f80f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 02:00:49 +00:00
Christopher Ferris
7a20156f00 Merge "Modify any lines with libc.so!libc.so to libc.so." am: d6ba6d2400
Original change: https://android-review.googlesource.com/c/platform/development/+/2089004

Change-Id: I226df484bd07165819e658ca6f7abe666b5db742
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 01:43:50 +00:00
Christopher Ferris
d6ba6d2400 Merge "Modify any lines with libc.so!libc.so to libc.so." 2022-05-06 01:11:41 +00:00
Christopher Ferris
7d4d527a1c Modify any lines with libc.so!libc.so to libc.so.
I had made this change if there was an offset on the line,
but I didn't make if there is no offset present. Add the
no offset present case.

Bug: 206463081

Test: Ran unit tests.
Test: Modified a normal stack line with libart.so to be
Test: libart.so!libart.so and verified the line numbers
Test: are still present.
Change-Id: I75e3fbe5eaa3a5419a2dca2c4542731c61c7b971
2022-05-05 15:14:01 -07:00
Christopher Ferris
aa544434cd Merge "Allow fixup of apex directories." am: 53c707781a am: b57824f4c1 am: 685afba9aa am: 317cb82f25 am: 88127a27fc
Original change: https://android-review.googlesource.com/c/platform/development/+/2072700

Change-Id: I4e5b027f77e041187926c218941795e607d3389d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 04:15:31 +00:00
Christopher Ferris
88127a27fc Merge "Allow fixup of apex directories." am: 53c707781a am: b57824f4c1 am: 685afba9aa am: 317cb82f25
Original change: https://android-review.googlesource.com/c/platform/development/+/2072700

Change-Id: Iacbb5ba5e6206a52e2a6416b9d57278bdf1266a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 22:01:16 +00:00
Christopher Ferris
317cb82f25 Merge "Allow fixup of apex directories." am: 53c707781a am: b57824f4c1 am: 685afba9aa
Original change: https://android-review.googlesource.com/c/platform/development/+/2072700

Change-Id: Ied0cd157034183a11ffdb86d78b49e0491e656fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 20:34:42 +00:00
Christopher Ferris
685afba9aa Merge "Allow fixup of apex directories." am: 53c707781a am: b57824f4c1
Original change: https://android-review.googlesource.com/c/platform/development/+/2072700

Change-Id: Id1bb0d664cbbaa4de79575a8166136428262f30f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 20:07:18 +00:00
Christopher Ferris
b57824f4c1 Merge "Allow fixup of apex directories." am: 53c707781a
Original change: https://android-review.googlesource.com/c/platform/development/+/2072700

Change-Id: I100da8b90b03ce3c1e57ef235fb4821ac4f69e70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 19:35:47 +00:00