Commit Graph

9469 Commits

Author SHA1 Message Date
Krzysztof Kosiński
694b7b0a0c Merge "hwui/debug: Remove glMultiDrawElementsBaseVertexOES stubs." into pi-dev am: 052dd1e712
am: b169383b2f

Change-Id: I5542dd86acb241d09979b1080ec4964a84a176dd
2018-04-10 15:58:37 -07:00
Krzysztof Kosiński
052dd1e712 Merge "hwui/debug: Remove glMultiDrawElementsBaseVertexOES stubs." into pi-dev 2018-04-10 22:23:09 +00:00
Ryan Mitchell
91706bee7b Merge "ResStringPool: Fix security vulnerability" into pi-dev am: 135d82ac45
am: 097ba79da7

Change-Id: I078117c08fdc713a40a52b1f3b07504593cc3c69
2018-04-09 18:56:53 -07:00
TreeHugger Robot
0fcb601b9d Merge "Update skia api for querying maxRenderTargetSize" 2018-04-10 01:52:33 +00:00
TreeHugger Robot
413a3c3812 Merge "Remove dead code" 2018-04-10 01:16:30 +00:00
Ryan Mitchell
135d82ac45 Merge "ResStringPool: Fix security vulnerability" into pi-dev 2018-04-09 23:38:37 +00:00
John Reck
7544d012dd Merge "Add support for render-ahead" 2018-04-09 23:18:06 +00:00
John Reck
617673f83f Remove dead code
Remove an old protobuf serialization experiement, skp capture
does this better

Test: builds

Change-Id: Icd875eabee6b517729f901841e48e579d0e8de4d
2018-04-09 14:50:40 -07:00
Greg Daniel
85e0907947 Update skia api for querying maxRenderTargetSize
Test: manual building and testing

Change-Id: I9a97de98d73f25f1c22d275c057c692f5dd3b5dc
2018-04-09 14:27:42 -04:00
John Reck
ec100976e0 Add support for render-ahead
For periods of time during which latency is less important
allow a client to request a deeper render-ahead pipeline.

The latency tradeoff results in less overall visual jank

Test: none, only used by macrobench

Change-Id: I516203b70bdc75b6415fa08bf9c4fb1b598b0102
2018-04-09 10:58:15 -07:00
Vadim Tryshev
ec025de985 Merge "Improving jank tests diagnostics" into pi-dev am: 2b28f0699a
am: 0aba38f04c

Change-Id: Ifdbf8391e767476d5e945df01be2c0e6070a24cf
2018-04-06 14:55:54 -07:00
TreeHugger Robot
2b28f0699a Merge "Improving jank tests diagnostics" into pi-dev 2018-04-06 20:57:25 +00:00
Vadim Tryshev
a90b243e46 Improving jank tests diagnostics
When there were 0 total frames, ProfileData generates something like:
Janky frames: 0 (nan%)

Then the test fails to parse it, and ends up with a mysterious
"Failed to parse NUM_JANKY" diag (see the bug).

Making the case 0/0 a 0%.

Bug: 77528721
Test: atest google/perf/jank/SystemUI/UbSystemUIJankTests:android.platform.systemui.tests.jank.LauncherJankTests#testOpenAllAppsContainer
Change-Id: Ib65b80dc689f7b6ee06b108114ffd7de9d739721
2018-04-06 12:25:40 -07:00
y
e46df9d47e ResStringPool: Fix security vulnerability
Adds detection of attacker-modified size and data fields passed to
ResStringPool::setTo(). These attacks are modified apks that AAPT would
not normally generate. In the rare case this occurs, the installation
cannot be allowed to continue.

Bug: 71361168
Bug: 71360999
Test: run cts -m CtsAppSecurityHostTestCases \
          -t android.appsecurity.cts.CorruptApkTests
Change-Id: If7eb93a9e723b16c8a0556fc4e20006aa0391d57
2018-04-06 18:12:42 +00:00
Jorim Jaggi
7c8a860cb9 Merge changes from topic "gpuprio" into pi-dev am: 7eeb0eb6d3
am: 89a0cc2406

Change-Id: I8cc93b1d10c4d3d80a0ded5559ccd2304551d2ab
2018-04-06 06:50:21 -07:00
Jorim Jaggi
767e25ed61 Add ability to change context priority of RT GL context
Test: Use method, observe GPU preemption behavior
Bug: 75985430
Change-Id: Idc08d37f8c95f52c5aab7edf09c0cbff72b8482d
2018-04-06 12:12:07 +00:00
Yi Jin
d01a55dcf1 Merge "This cl tries to fix cts tests IncidentdTest" into pi-dev am: 72a39eb3be
am: dceecbd1fa

Change-Id: If7909669f4a898583b5c65d1b72a9d6f890e9284
2018-04-05 12:41:36 -07:00
TreeHugger Robot
72a39eb3be Merge "This cl tries to fix cts tests IncidentdTest" into pi-dev 2018-04-05 18:48:59 +00:00
Yi Jin
ad3e6e5d5a This cl tries to fix cts tests IncidentdTest
1. Disable BatteryType section which is device-specific
2. Make timeout longer since meminfo section timedout in test
3. make some negative values sint
4. varint can be 64 bits, there is a bug implicitly convert it to 32
which loses values.
5. Found another bug which failed to read 64 bits varint, create a
native test to make sure it works.

Bug: 77291057
Test: atest CtsIncidentHostTestCases:com.android.server.cts.IncidentdTest
Change-Id: I04cc730741f7901f37ac57a11af7777d57118a23
2018-04-04 16:29:55 -07:00
Ryan Mitchell
49668cd130 Merge "Added decoding of truncated AAPT string lengths." into pi-dev 2018-04-04 21:21:10 +00:00
Ryan Mitchell
2ad530d76c Added decoding of truncated AAPT string lengths.
AAPT incorrectly writes a truncated string length when the string size
exceeded the maximum possible encode length value (0x7FFF). To decode a
truncated length, this change iterates through length values that end
in the encode length bits. Strings that exceed the maximum encode length
are not placed into StringPools in AAPT2.

Test: Successfully ran broken apps from the duplicates of the bugs
provided and created tests
Bug: 69320870

Change-Id: I99dd9b63e91ac250f81d5dfc26b7c0e6276ae162
(cherry picked from commit ea9e8b447a)
2018-04-04 15:56:11 +00:00
Ryan Mitchell
6759955c95 Fixed resource bag retrieval infinite recursion.
An app was crashing because in an attempt to retrieve layout
attribute/style data, the app infinitely recursed because its parent was
set to itself. This change checks if the resource bag parent and child
have the same ids, and if so, attempts to find the resource in this bag
alone rather than attempting to also look in parent bags.

Bug: 74493983
Test: Manual testing of Fitbit app
Change-Id: Iea37533a0676bd51b72c9bb235adec9bd04f2ccc
(cherry picked from commit ac04095ba9)
2018-04-04 15:55:34 +00:00
Derek Sollenberger
4bd7e2b733 Merge "Free up all scratch resources when the app's UI is hidden" into pi-dev am: 26f99b4cb7
am: 7af6ec70b6

Change-Id: I6fab7c61d5ff3d2cf4931a0ac32dacadb5f1507f
2018-04-03 15:11:04 -07:00
Derek Sollenberger
b1f27aae89 Free up all scratch resources when the app's UI is hidden
Bug: 73808481
Test: hwui_unit_tests
Change-Id: I9f191c776a936c1be40702ff0924c7ad054526d5
2018-04-03 11:53:43 -04:00
Derek Sollenberger
5bf5521670 Merge "Print detailed memory usage of Skia for dumpsys gfxinfo" into pi-dev am: 8ec341627c
am: b0765db5b8

Change-Id: I7d534a8c8a58aa314f8beb719b5ff7e99a42815e
2018-04-02 22:37:31 -07:00
Yi Jin
194a7f6c86 Merge "Use modern c++ code style for incidentd." into pi-dev am: 56051569ab
am: 85d3cc02a1

Change-Id: Ia85dd17da1e0aefbb3bdece55c96f4e6b6686119
2018-04-02 18:07:02 -07:00
TreeHugger Robot
00d439f9dc Merge "Added decoding of truncated AAPT string lengths." 2018-04-02 20:36:43 +00:00
Derek Sollenberger
0057db22fe Print detailed memory usage of Skia for dumpsys gfxinfo
Bug: 74435803
Test: adb shell dumpsys gfxinfo [package_name]
Change-Id: I1f2bcab500fb47c5e0b50c7459d4a876b063916b
2018-04-02 15:37:06 -04:00
Ryan Mitchell
ea9e8b447a Added decoding of truncated AAPT string lengths.
AAPT incorrectly writes a truncated string length when the string size
exceeded the maximum possible encode length value (0x7FFF). To decode a
truncated length, this change iterates through length values that end
in the encode length bits. Strings that exceed the maximum encode length
are not placed into StringPools in AAPT2.

Test: Successfully ran broken apps from the duplicates of the bugs
provided and created tests
Bug: 69320870

Change-Id: I99dd9b63e91ac250f81d5dfc26b7c0e6276ae162
2018-04-02 12:20:14 -07:00
Ryan Mitchell
142a7ce5e7 Merge "Fixed resource bag retrieval infinite recursion." 2018-04-02 19:07:24 +00:00
TreeHugger Robot
56051569ab Merge "Use modern c++ code style for incidentd." into pi-dev 2018-04-02 18:01:15 +00:00
Krzysztof Kosiński
fc968058bf hwui/debug: Remove glMultiDrawElementsBaseVertexOES stubs.
This function was included by mistake in Khronos OpenGL headers.
See this link for further information:
https://github.com/KhronosGroup/OpenGL-Registry/issues/81

Bug: 32147090
Bug: 66900669
Bug: 72959780
Test: Built and flashed the build onto Pixel XL, ran some CTS tests.
Change-Id: If8f9837466b7d3eb0685624a70b5d5b6fbd86e2e
2018-04-02 09:44:22 -07:00
Yi Jin
c532325592 Merge "Correctly use int types and fix uint64_t print." into pi-dev am: 53f60f60ee
am: 018f5a3ca2

Change-Id: Ie9715a097e15f7ea277fd8a2e839af2a31d61fea
2018-03-31 07:09:46 +00:00
Yi Jin
6cacbcbf43 Use modern c++ code style for incidentd.
This cl does not contain code logic changes.

Bug: 77333635
Test: manual and incidentd_test
Change-Id: Iea0a402b1051defd45159ca267e6dd705f9ffa49
2018-03-30 17:36:49 -07:00
Yi Jin
00a754499e Correctly use int types and fix uint64_t print.
Bug: 74118023
Test: atest incidentd_test and atest incident_helper
Change-Id: I951021c12e3d0dc5c83a1bbb03fa0d64d99c0920
2018-03-30 17:06:46 -07:00
Ryan Mitchell
ac04095ba9 Fixed resource bag retrieval infinite recursion.
An app was crashing because in an attempt to retrieve layout
attribute/style data, the app infinitely recursed because its parent was
set to itself. This change checks if the resource bag parent and child
have the same ids, and if so, attempts to find the resource in this bag
alone rather than attempting to also look in parent bags.

Bug: 74493983
Test: Manual testing of Fitbit app
Change-Id: Iea37533a0676bd51b72c9bb235adec9bd04f2ccc
2018-03-30 16:13:53 -07:00
Stan Iliev
43df80574a Merge "Fix memory leak in ShaderCache" into pi-dev am: e275d0bc19
am: d00eedd25b

Change-Id: If8311555a24baaef993cf4d757f44af8a156bfd6
2018-03-30 22:39:25 +00:00
Leon Scroggins III
9ce6bf9cc0 Merge "Fix Skia's impl for TextureView.getBitmap" into pi-dev am: 5d27097739
am: 6eb88411e6

Change-Id: I04f782a456997f6946a1ea258dea964ffd1b59f2
2018-03-30 14:36:40 +00:00
Stan Iliev
003a9f6738 Fix memory leak in ShaderCache
Fix memory leak in a limited memory situation within
ShaderCache::load().

Bug: 76213660
Test: Passed ShaderCacheTest unit test, ran a build on device.
Change-Id: Ibb6ea8fe167eb22bcbbaffc4cfffac12eda98c42
2018-03-30 14:19:39 +00:00
Kweku Adams
6e8223e11f Merge "Creating java package for Privacy proto." into pi-dev am: 12912d71b1
am: 2a158b0fa7

Change-Id: I2b45f109f6314c4a9a182a0c7e5874b089adc4ca
2018-03-30 11:02:21 +00:00
TreeHugger Robot
5d27097739 Merge "Fix Skia's impl for TextureView.getBitmap" into pi-dev 2018-03-30 00:48:29 +00:00
Kweku Adams
15caf835ec Creating java package for Privacy proto.
Also setting fields in the GlobalSettingsProto.Private message to LOCAL.

Bug: 72814439
Bug: 74975371
Test: flash device and check incident.proto output
Change-Id: Ia580144b8b0d0cb9bd9a3297a37213ed5f60a514
2018-03-29 14:28:57 -07:00
Leon Scroggins III
1a12ab26d4 Fix Skia's impl for TextureView.getBitmap
Bug: 73392905
Test: New test added with I2d4ef440f943a50b9367976ba1444f4350071bfd

When providing a width and height, getBitmap should scale to the
destination. Add a parameter to LayerDrawable::DrawLayer for a
destination rectangle to scale to. Pass the size of the bitmap in
SkiaOpenGLPipeline::copyLayerInto down to DrawLayer. The only other
caller of DrawLayer is unaffected.

Change-Id: I7aa192181c2d15bc8fd4de2fb15c4d276b05d2ac
2018-03-29 19:30:28 +00:00
John Reck
ecc58adba1 Merge "Change shader precision because of CTS Fail." 2018-03-29 19:23:23 +00:00
Stan Iliev
a41ca2b2fd Merge "Merge "Better error reporting for createOrUpdateLayer" into pi-dev am: 67a58660b9" into pi-dev-plus-aosp
am: 0bb7fbe729

Change-Id: I722510bbf527f1dd4eb323bf4be48653eb3562cc
2018-03-28 21:38:08 +00:00
TreeHugger Robot
67a58660b9 Merge "Better error reporting for createOrUpdateLayer" into pi-dev 2018-03-28 20:28:59 +00:00
Stan Iliev
216b1572b4 Better error reporting for createOrUpdateLayer
Pass error handler down to the pipeline object, which allows
skia pipelines to print cache memory usage.
In case of an error, print arguments that were used to invoke
SkSurface::MakeRenderTarget.

Test: Ran android build on a device
Bug: 76115654
Change-Id: I5baddfa66debd505eddc3117cf94aa6ae69bedaa
2018-03-28 13:49:21 -04:00
dohyunia.kim
1efe59f3a4 Change shader precision because of CTS Fail.
Change-Id: I5d8747ecf9091a251b56d3a9de4bdb8ab0260898
2018-03-28 16:52:21 +08:00
Doris Liu
6b5c2b77b6 Merge "More path validation for better error message" into pi-dev am: 4f975de2f8
am: b16207c0bc

Change-Id: I19bc692024e9f5ead71e49acaf458aebc733d757
2018-03-28 04:42:50 +00:00
Doris Liu
4ad0e1425b More path validation for better error message
BUG: 73759524
Test: Unit test updated
Change-Id: I2774450174ad6490a1d5e6c81766a2982c2aa6f1
2018-03-26 18:12:31 +00:00