Commit Graph

26919 Commits

Author SHA1 Message Date
Vishnu Nair
398e99ba08 [automerger skipped] Merge changes I85f52bd3,Ia91262e4,Ie084d288,I693815ff,If696d330, ... am: a1d3b9d995 -s ours
am: c1397cface -s ours
am skip reason: change_id I85f52bd3dc9174499c4a4840c6b5e80555f28fc7 with SHA1 4c71de20a8 is in history

Change-Id: I50820d94da8f074f43502c4d0ea286e69d3ee8cf
2019-07-02 15:20:06 -07:00
Raju Kulkarni
2c8f205c9a Updating Package revision number for SDK API 29 r2 release. r2 release will have updated APIs because of:b/78283907 Bug: 136477680 Test: N/A
am: b431a8c328

Change-Id: Icd9aa14192fef8fea4dab048c5e7bd00451a0cb4
2019-07-02 14:43:45 -07:00
Vishnu Nair
c1397cface [automerger skipped] Merge changes I85f52bd3,Ia91262e4,Ie084d288,I693815ff,If696d330, ...
am: a1d3b9d995 -s ours
am skip reason: change_id I85f52bd3dc9174499c4a4840c6b5e80555f28fc7 with SHA1 4c71de20a8 is in history

Change-Id: I833ab3aeeedc44565a593376e90d5872aa18c400
2019-07-02 10:14:28 -07:00
Treehugger Robot
a1d3b9d995 Merge changes I85f52bd3,Ia91262e4,Ie084d288,I693815ff,If696d330, ...
* changes:
  WinScope: Support missing layers
  Winscope: Fix how layers with transforms and positions are rendered
  WinScope: Modify instead of replacing proto objects
  Support SF traces without any layers (needed when booting SF)
  Winscope: Translate layer flags in Surface flinger dump
  Update `Display default` checkbox label
  Add Type to transform objects.
  Fix visibility rule for SF traces on Winscope
  Allow SF traces to omit default values on the property list
  Fix "TypeError: Cannot read property 'x' of null" on SF traces
  Display only elements actually visible on the screen as "Visible"
  Display SF layer based on size, crop & parent instead of buffer size
  WinScope: Support boundless surfaces in WinScope
  Winscope: Use a unique stableId for all layers and wm entries
  Winscope: keep backwards compatibility prior to windowFrames
2019-07-02 13:58:25 +00:00
Xin Li
6b17c9dbda DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
Bug: 134405016
Change-Id: I09133c27ae2f161baae2ff83b943e2fec5fd4ea0
2019-07-01 20:58:44 +00:00
Raju Kulkarni
b431a8c328 Updating Package revision number for SDK API 29 r2 release.
r2 release will have updated APIs because of:b/78283907
Bug: 136477680
Test: N/A

Change-Id: I40810f36a6b374886375b1c07be7efd18b0611dc
2019-07-01 11:28:45 -07:00
chaviw
d540ec7d98 [automerger skipped] Merge "Use windowFrames.frame instead of frame to draw the area." am: f9d35cf89e
am: 3bcb668c1a -s ours
am skip reason: change_id I072daae54601120de5b6eaa0a64ee7c3096e4a43 with SHA1 7138f343a1 is in history

Change-Id: Ic79ea427005cd10435c2d5fea719b6e23ce98cb0
2019-06-28 11:33:05 -07:00
Kevin DuBois
b905225fb6 [automerger skipped] Merge "Winscope: fix .pb location for sf traces" am: 2f7f18d495
am: 19125e9c69 -s ours
am skip reason: change_id Ia84501014e6cf83d2fb1d167c1a7aac8b64a06d4 with SHA1 a938f290a0 is in history

Change-Id: I6925fa155a66bdca4c8a21146a23f3bff645e8ea
2019-06-28 11:31:56 -07:00
chaviw
3bcb668c1a Merge "Use windowFrames.frame instead of frame to draw the area."
am: f9d35cf89e

Change-Id: Id5619922102a0cf201339081f637a3c47c8222bf
2019-06-28 11:24:58 -07:00
Kevin DuBois
19125e9c69 Merge "Winscope: fix .pb location for sf traces"
am: 2f7f18d495

Change-Id: I73dc649e1b57561932bcc1b103e19038be78a243
2019-06-28 11:23:53 -07:00
Treehugger Robot
f9d35cf89e Merge "Use windowFrames.frame instead of frame to draw the area." 2019-06-28 18:10:28 +00:00
Treehugger Robot
2f7f18d495 Merge "Winscope: fix .pb location for sf traces" 2019-06-28 17:18:35 +00:00
Bob Badour
801760580f Merge "Clarify license terms for Romain Guy's artwork." am: a37de64bd6
am: fb5f7546b0

Change-Id: I964e6ca1dcc1bf15925d79a80e9707d8e691c4d8
2019-06-27 20:31:48 -07:00
Bob Badour
fb5f7546b0 Merge "Clarify license terms for Romain Guy's artwork."
am: a37de64bd6

Change-Id: I4e199050c7cc658a542da3ad3d5e4100f3348890
2019-06-27 20:14:48 -07:00
Treehugger Robot
a37de64bd6 Merge "Clarify license terms for Romain Guy's artwork." 2019-06-28 02:05:46 +00:00
Bob Badour
e72c60e885 Clarify license terms for Romain Guy's artwork.
As discussed with Romain Guy in the email thread, the Apache 2.0
license applies to the affected .jpg files now and retroactively from
the time of import.

Usage terms updated using exiftool:

$ exiftool -UsageTerms='Apache License Version 2.0' \
    development/samples/ApiDemos/res/drawable-nodpi/frantic.jpg
Warning: [minor] Fixed incorrect list type for XMP-xmpRights:UsageTerms - development/samples/ApiDemos/res/drawable-nodpi/frantic.jpg
    1 image files updated
$ exiftool -URL -WebStatement -UsageTerms -Rights -Creator \
    development/samples/ApiDemos/res/drawable-nodpi/frantic.jpg
Usage Terms                     : Apache License Version 2.0
Rights                          : Romain Guy
Creator                         : Romain Guy
$ exiftool -UsageTerms='Apache License Version 2.0' \
    development/samples/devbytes/animation/PictureViewer/res/drawable-nodpi/p3.jpg
    1 image files updated
$ exiftool -URL -WebStatement -UsageTerms -Rights -Creator \
    development/samples/devbytes/animation/PictureViewer/res/drawable-nodpi/p3.jpg
Usage Terms                     : Apache License Version 2.0
Rights                          : Romain Guy
Creator                         : Romain Guy
$ exiftool -UsageTerms='Apache License Version 2.0' \
    development/samples/devbytes/animation/PictureViewer/res/drawable-nodpi/p2.jpg
    1 image files updated
$ exiftool -URL -WebStatement -UsageTerms -Rights -Creator \
    development/samples/devbytes/animation/PictureViewer/res/drawable-nodpi/p2.jpg
Usage Terms                     : Apache License Version 2.0
Rights                          : Romain Guy
Creator                         : Romain Guy
$ exiftool -UsageTerms='Apache License Version 2.0' \
    development/samples/devbytes/animation/ActivityAnimations/res/drawable-nodpi/p3.jpg
    1 image files updated
$ exiftool -URL -WebStatement -UsageTerms -Rights -Creator \
    development/samples/devbytes/animation/ActivityAnimations/res/drawable-nodpi/p3.jpg
Usage Terms                     : Apache License Version 2.0
Rights                          : Romain Guy
Creator                         : Romain Guy
$ exiftool -UsageTerms='Apache License Version 2.0' \
    development/samples/devbytes/animation/ActivityAnimations/res/drawable-nodpi/p2.jpg
    1 image files updated
$ exiftool -URL -WebStatement -UsageTerms -Rights -Creator \
    development/samples/devbytes/animation/ActivityAnimations/res/drawable-nodpi/p2.jpg
Usage Terms                     : Apache License Version 2.0
Rights                          : Romain Guy
Creator                         : Romain Guy

Test: doesn't realy apply to images

Change-Id: If060c6ba0f0279e3a7e6446061d50cd8e4cdec3c
2019-06-27 14:58:10 -07:00
Alexander Smundak
dc5a7ea905 Merge "Convert Android.mk files to Android.bp" am: 1ccb28f28a
am: aabc1be2ea

Change-Id: Ic2e36324d145bc7ff064647b8304f548235382aa
2019-06-27 09:34:48 -07:00
Alexander Smundak
aabc1be2ea Merge "Convert Android.mk files to Android.bp"
am: 1ccb28f28a

Change-Id: Ib4516944eed20457df20a8c17bd6a457e948fba9
2019-06-27 09:23:53 -07:00
Alexander Smundak
1ccb28f28a Merge "Convert Android.mk files to Android.bp" 2019-06-27 15:25:37 +00:00
Adrian Roos
caf8c73b64 [automerger skipped] Merge "Winscope: apply surface transforms in preview" am: 456ccff485
am: 05693202ac -s ours
am skip reason: change_id Ia9528401a0d8542266a7898be6d032a6cf166946 with SHA1 2394e4ecac is in history

Change-Id: I006b69a82302a4272f1625b330416395fffd5e85
2019-06-26 13:02:26 -07:00
Adrian Roos
05693202ac Merge "Winscope: apply surface transforms in preview"
am: 456ccff485

Change-Id: I2711f7ed3b2e4b818c4badf1f2469a3d8762ec4a
2019-06-26 12:54:24 -07:00
Treehugger Robot
456ccff485 Merge "Winscope: apply surface transforms in preview" 2019-06-26 19:01:47 +00:00
Sasha Smundak
bef01b9173 Convert Android.mk files to Android.bp
See build/soong/README.md for more information.

Bug: 122332515
Test: treehugger
Change-Id: I0f6ae8d880114d1bc83f7aac2b96eafef76dc046
2019-06-25 14:18:16 -07:00
Vishnu Nair
e78dce7aee [automerger skipped] Merge "WinScope: Show IME windows" am: 38379147fa
am: 1ae22e2952 -s ours
am skip reason: change_id If69e1bc340c0c79a5fb07385cc6921dd093e8fc2 with SHA1 97c5b512a3 is in history

Change-Id: I3e4bb22f6188899b46db3270b4c4adfefdd36378
2019-06-25 10:39:32 -07:00
Vishnu Nair
1ae22e2952 Merge "WinScope: Show IME windows"
am: 38379147fa

Change-Id: Ib26b66083f91d3e67bd779c9190fb779f8fbe8a2
2019-06-25 10:29:29 -07:00
Adrian Roos
211c150d75 [automerger skipped] Merge "WinScope: Properly show child windows." am: acf69cc766
am: d63def531c -s ours
am skip reason: change_id I188bb2c327bc61c309f7e3e3746f0af4241a94a9 with SHA1 45094b9c03 is in history

Change-Id: I742f9aca94ad66899c92f2a9d4306f16fc9576dd
2019-06-25 09:55:22 -07:00
Treehugger Robot
38379147fa Merge "WinScope: Show IME windows" 2019-06-25 16:52:57 +00:00
Adrian Roos
d63def531c Merge "WinScope: Properly show child windows."
am: acf69cc766

Change-Id: Ie97ef7ee853d20691b504f3c5b87b1079ec8b2ab
2019-06-25 09:40:05 -07:00
Treehugger Robot
acf69cc766 Merge "WinScope: Properly show child windows." 2019-06-25 16:10:24 +00:00
Hsin-Yi Chen
a2b16b2bff Merge "Generate lsdump without sdump" am: df6ed868b9
am: 277494d4aa

Change-Id: Ie4942dc442b6542ec78d1b9a23ad6a78c4657f0d
2019-06-24 19:45:17 -07:00
Hsin-Yi Chen
277494d4aa Merge "Generate lsdump without sdump"
am: df6ed868b9

Change-Id: Ibc01fce4dc91a3371ed5f7502401669ae4fc890b
2019-06-24 19:39:37 -07:00
Hsin-Yi Chen
df6ed868b9 Merge "Generate lsdump without sdump" 2019-06-25 02:11:56 +00:00
Hsin-Yi Chen
da5b477770 Generate lsdump without sdump
This commit changes <dump-files> to be an optional parameter for
header-abi-linker. The linker can generate lsdump files for libraries
without source files.

Test: ./test.py
Test: ./create_reference_dumps.py -products aosp_arm64
Bug: 135728451
Change-Id: Ib9fe56591bd476921904118b1bafcdf2e987f8bb
2019-06-24 14:13:35 +08:00
Steven Moreland
c33f3327aa Merge "Remove unused import of ServiceManagerNative." am: 9958d0da90
am: 9a67b9d69e

Change-Id: Ibedc16800360be966fb3e47a802f58147775c461
2019-06-22 17:14:15 -07:00
Steven Moreland
9a67b9d69e Merge "Remove unused import of ServiceManagerNative."
am: 9958d0da90

Change-Id: I858adab5e961a1c58c942ee53445d3489c1ff11d
2019-06-22 16:34:55 -07:00
Treehugger Robot
9958d0da90 Merge "Remove unused import of ServiceManagerNative." 2019-06-22 07:18:30 +00:00
Steven Moreland
bdc5faa067 Remove unused import of ServiceManagerNative.
Bug: 135768100
Test: N/A
Change-Id: Ieb11d0a7b083ba2518047596241d31887f81a916
2019-06-21 15:37:20 -07:00
Jeongik Cha
29befa9dcf Merge "system and product image diff tool" am: e65b3cc324
am: 9bc50603fe

Change-Id: Id1957b208706e7caf68b15e0c9a1c218b77f79ab
2019-06-18 11:28:31 -07:00
Jeongik Cha
9bc50603fe Merge "system and product image diff tool"
am: e65b3cc324

Change-Id: I693064887b2aa970a240b688e811786e22c10431
2019-06-18 11:07:43 -07:00
Treehugger Robot
e65b3cc324 Merge "system and product image diff tool" 2019-06-18 17:34:31 +00:00
Vishnu Nair
b5568bfcc8 WinScope: Support missing layers
The new sf layer transform changes breaks when missing layers are added since they do not contain transform
data. Fix this is by adding a transform when creating missing layers.

Also set the transform type when populating transform matrices so they are displayed as IDENTITY.

Test: Open trace from bug
Fixes: 130886882
Merged-In: I85f52bd3dc9174499c4a4840c6b5e80555f28fc7
Change-Id: I85f52bd3dc9174499c4a4840c6b5e80555f28fc7
2019-06-18 12:59:15 +00:00
Vishnu Nair
7f45d5d5ec Winscope: Fix how layers with transforms and positions are rendered
Currently position is applied to the layer bounds before applying the transform. The bounds
are also not bounded by parent bounds.

Change the logic to use the calculated layer bounds and apply the transform with position when
rendering the layer on screen.
Keep existing logic to view traces before layer bounds were added.

Bug: 128925841
Test: open winscope with old (P) and new trace (Q ToT). Check if layers are rendered correctly when rotated.
Merged-In: Ia91262e4dfe3e8ad647acf8e0cf961e270441cde
Change-Id: Ia91262e4dfe3e8ad647acf8e0cf961e270441cde
2019-06-18 12:59:07 +00:00
Vishnu Nair
47c7571f0b WinScope: Modify instead of replacing proto objects
Converting the proto object inorder to set the enum string values
or display default values replaces existing proto objects and its
properties which maybe used by the formatter function.

Instead replace toObject method with a custom one that limits
modifications to the existing proto objects.

Test: run WinScope and check WM and SF traces

Merged-In: Ie084d288aaf569476f1e9284c3a9c8a06364a61a
Change-Id: Ie084d288aaf569476f1e9284c3a9c8a06364a61a
2019-06-18 12:58:28 +00:00
Nataniel Borges
4e524b0b78 Support SF traces without any layers (needed when booting SF)
When using continuous logging and having the trace enabled by default,
the first entries have no layers and crash Winscope.

Test: Flash a device with SF tracing enabled by default. Record the
initial trace. Open trace in Winscope.

Merged-In: I693815ff3e6468291770d3e8197e21bf75a2a87a
Change-Id: I693815ff3e6468291770d3e8197e21bf75a2a87a
2019-06-18 12:58:09 +00:00
Vishnu Nair
5c006d104a Winscope: Translate layer flags in Surface flinger dump
Test: Open sf trace and check if flags are translated
Fixes: 127436444
Merged-In: If696d33054ae566d209b769427f5681d4e1ff876
Change-Id: If696d33054ae566d209b769427f5681d4e1ff876
2019-06-18 12:58:02 +00:00
Nataniel Borges
d122ad83ff Update Display default checkbox label
Replace label for `Show default properties` and add tooltip explaining
what this checkbox is used for

Test: Open winscope
Merged-In: I39de3e1d7c203d5273084bd54c4d2f749e8e6f5f
Change-Id: I39de3e1d7c203d5273084bd54c4d2f749e8e6f5f
2019-06-18 12:57:56 +00:00
Nataniel Borges
7f63847ec5 Add Type to transform objects.
Add a type, based on the framework/native definitions, to the transform
objects.

If the transform matrix can be reconstructed from the type (identity,
translate, rotate 0/90/180/270) it should not be stored on the protobuf,
but should instead be reconstructed on Winscope.

Test: Record a Proto3 SF trace. Open it without displaying default
values in Winscope. Check if it is correct. Select a legacy trace. Open
it in Winscope. Check is it is also correct.

Merged-In: I03744efba2c8740d7c543f6793bce0ba7bf6d975
Change-Id: I03744efba2c8740d7c543f6793bce0ba7bf6d975
2019-06-18 12:57:47 +00:00
Nataniel Borges
eacb719985 Fix visibility rule for SF traces on Winscope
When traces don't have a visible region object assigned winscope crashes
while loading a SF trace.

Test: Open a SF trace without a visible region object on winscope. It
should no longer crash

Merged-In: I7919a0301ccfb6a0811fd15feb718c8ac0b210b1
Change-Id: I7919a0301ccfb6a0811fd15feb718c8ac0b210b1
2019-06-18 12:57:40 +00:00
Nataniel Borges
f1e0f50a01 Allow SF traces to omit default values on the property list
The C++ proto2 implementation write the default values ot the file.
Until the surface flinger dump is updated to proto3, this implementation
will not have any effect.

Test: (Un)Check the `display defaults` checkbox. Load a file. If the
checkbox is unchecked, default values should not appear on winscope,
otherwise they should appear.

Merged-In: I2432966f3e14aba5fc1dee26d5a09c743406b417
Change-Id: I2432966f3e14aba5fc1dee26d5a09c743406b417
2019-06-18 12:57:33 +00:00
Nataniel Borges
10ef665c58 Fix "TypeError: Cannot read property 'x' of null" on SF traces
The protobuf definition allows the position attribute not to be defined.
Winscope crashes if the position is not defined, instead of assuming it
as (x: 0, y: 0)

Test: Load a SF protobuf object without the position attribute. Check if
Winscope does't crash while loading it.

Merged-In: Ib12ba7875f1e7b22819274c1cd9961a1dbfe82cf
Change-Id: Ib12ba7875f1e7b22819274c1cd9961a1dbfe82cf
2019-06-18 12:57:26 +00:00