Commit Graph

9418 Commits

Author SHA1 Message Date
TreeHugger Robot
1c70ecb455 Merge "Unpin bitmaps but don't purge all scratch resources." into pi-dev 2018-04-16 17:05:45 +00:00
Ryan Mitchell
3ddd801449 Merge "AAPT2: GetBag infinite recursion fix" into pi-dev 2018-04-13 17:44:11 +00:00
y
57cd195c43 AAPT2: GetBag infinite recursion fix
Style resources with circular parental dependencies caused infinite
recursion when calling AssetManager2::GetBag. This fix allows recursion
to cease when a circular dependency is found.

Bug: 77928512
Change-Id: Ib900c36ab1aef5da5b03234a9484c4dad3b63c02
Test: Manual test of b/77928512 and duplicates of 74493983
2018-04-13 08:50:09 -07:00
TreeHugger Robot
d0fdef9229 Merge "Revert "Revert "Update material_deep_teal_500 to #008577.""" into pi-dev 2018-04-12 23:23:00 +00:00
Kweku Adams
1856a4cfcc Adding privacy tags to graphicsstats proto.
Creating a copy of the graphicsstats proto so that one can be tagged
with privacy annotations and the other can be used internally while
still using the protobuf-cpp-lite library.

Bug: 72570104
Test: flash device and check incident output
Merged-In: I2d72e7bd17689c1401a16d5a13956e6528ddb525
Change-Id: I0a46ee6cc463b133925be1cf8dee8cf3d107930c
2018-04-12 14:23:15 -07:00
Derek Sollenberger
92a9eb9713 Unpin bitmaps but don't purge all scratch resources.
This is a partial revert of b1f27aae89.

Test: hwui_unit_tests
Bug: 77654081
Change-Id: I5a58c156a280edfe3e9973ac3a8a30c97a2cff8b
2018-04-12 13:42:19 -04:00
Andrew Sapperstein
8546c30fbf Revert "Revert "Update material_deep_teal_500 to #008577.""
This reverts commit 431d9d63e9.

Reason for revert: Rolling forward with a fix.

Change-Id: I5804e240535b84e0f4b2d306649b1981a9871632
Merged-In: I5804e240535b84e0f4b2d306649b1981a9871632
Bug: 74118164
Test: atest cts/hostsidetests/theme
2018-04-11 20:48:11 +00:00
Krzysztof Kosiński
052dd1e712 Merge "hwui/debug: Remove glMultiDrawElementsBaseVertexOES stubs." into pi-dev 2018-04-10 22:23:09 +00:00
Ryan Mitchell
135d82ac45 Merge "ResStringPool: Fix security vulnerability" into pi-dev 2018-04-09 23:38:37 +00: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
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
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
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
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
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
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
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
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
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
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
John Reck
6045d66aa2 Merge "Add isPivotSet/resetPivot" into pi-dev 2018-03-23 19:26:50 +00:00
TreeHugger Robot
909402935c Merge "Fix resource by name lookup" into pi-dev 2018-03-23 17:51:24 +00:00
TreeHugger Robot
13269764e5 Merge "Clear the frame buffer for F16 pixel format" into pi-dev 2018-03-23 17:14:01 +00:00
Stan Iliev
aadc032045 Clear the frame buffer for F16 pixel format
This is a workaround for Qualcomm bug and should be reverted
after a proper fixed is found.

Bug: 74976293
Test: Ran Photo app
Change-Id: I9e0a4634f02c3553635f058eb588b510a63273ba
2018-03-23 10:50:11 -04:00
TreeHugger Robot
dfdc379144 Merge "detect api version, and start respecting offsets" into pi-dev 2018-03-23 11:25:19 +00:00
Svet Ganov
3f08542208 Fix resource by name lookup
Test: added: '@' cases to ResourceUtilsTest
      pass: ./out/host/darwin-x86/nativetest/libandroidfw_tests/libandroidfw_tests
      pass: ./out/host/darwin-x86/nativetest/aapt2_tests/aapt2_tests
      pass: cts-tradefed run cts-dev -m CtsAppSecurityHostTestCases
                -t android.appsecurity.cts.PermissionsHostTest

Bug: 74612500

Change-Id: I144e4ca1b63b9cce71052fc02089bb6092739889
2018-03-22 20:59:05 -07:00
Jorim Jaggi
a43de8b61a Merge "Remove old workaround for display issues" into pi-dev 2018-03-22 21:18:49 +00:00
Andrew Sapperstein
eae9144add Merge "Revert "Update material_deep_teal_500 to #008577."" into pi-dev 2018-03-22 19:31:23 +00:00
Andrew Sapperstein
431d9d63e9 Revert "Update material_deep_teal_500 to #008577."
This reverts commit 5c228d5eb9.

Reason for revert: Breaks presubmit. b/76126268

Change-Id: Iffd8bbb62d05cae1c2a5dabfab2824899c5ff3cf
Bug: 74118164
Bug: 76126268
Test: presubmit
2018-03-22 15:56:27 +00:00
John Reck
8686e1f157 Add isPivotSet/resetPivot
Bug: 74825533
Test: CTS view tests in topic
Change-Id: Ib918bc5830d53ee0a83b13ab53ac6e8dd86c869f
2018-03-21 16:42:59 -07:00
John Reck
6f75da0474 Remove old workaround for display issues
Bug: 76086140
Test: A bunch of systraces, things looked OK
Change-Id: I447e976a937160c0bb3b52afd57661e7ffa0c9ec
2018-03-21 14:43:40 -07:00
TreeHugger Robot
74d9b14f21 Merge "Update material_deep_teal_500 to #008577." into pi-dev 2018-03-21 17:45:25 +00:00
Mike Reed
322bc57a33 detect api version, and start respecting offsets
Test: make

Bug: 36471624
Change-Id: Ica10c557bf35e8d707fabbafab49d22109916fd3
2018-03-21 17:39:01 +00:00
Leon Scroggins
d848f75f99 Merge "Report native allocation size of AnimatedImageDrawable" into pi-dev 2018-03-21 16:48:19 +00:00
Leon Scroggins III
eb3b38e22c Report native allocation size of AnimatedImageDrawable
Bug: 73641604
Test: infeasible

Fix nNativeByteSize's return value to be jlong, instead of long.
Add up the bytes used by the SkAnimatedImage and SkPictures and store
them on the AnimatedImageDrawable for registration.
Note that this is an approximation, and it assumes it will be drawn to a
hardware canvas and animated.
2018-03-21 09:28:00 -04:00
John Reck
0e4864725a Revert "Revert "Break down jank between frame drops vs. triple buffered""
This reverts commit a6d8fbf4ea.

Fixes an out-of-bounds read in COMPARISONS by switching up
how comparisons works. Instead of requiring all jank types
to have an associated COMPARISON's entry, which kHighInputLatency
and kMissedDeadline don't, instead have each
COMPARISON indicate which JankType it applies to so it can
be independently sized from JankTypes.

Bug: 70220906
Bug: 75566601
Test: launching & using maps works
Change-Id: I7fd90daeb320b4627e42c3418c89726d860998c1
2018-03-19 16:36:32 -07:00
TreeHugger Robot
fbb4b82156 Merge "Revert "Break down jank between frame drops vs. triple buffered"" into pi-dev 2018-03-19 19:44:14 +00:00
Aaron Whyte
a6d8fbf4ea Revert "Break down jank between frame drops vs. triple buffered"
This reverts commit 09979fbee7.

Reason for revert: Based on stacktraces and change history, I think this is causing a cluster of P crashes.
https://b.corp.google.com/issues?q=(%22android%22%20%22:uirenderer::JankTracker::finishFrame%22)
Bug: 75566601
Bug: 75811585
Bug: 75407175
Bug: 75736222
Bug: 75391447
Bug: 75659839

Change-Id: I59a8c2d8906d347210c77fb3628f5801bc299bfb
2018-03-19 17:53:48 +00:00
Andrew Sapperstein
5c228d5eb9 Update material_deep_teal_500 to #008577.
Better for accessibility.

Also update some direct usage of the old value to use canonical versions.

Bug: 74118164
Test: asset swap
Change-Id: If0f07f04f72a16dc3662e2cf3a93e2b040d0bdb8
2018-03-18 11:24:49 -07:00