6516 Commits

Author SHA1 Message Date
John Reck
4c9e59d03c Unify DrawProfiler/JankStats
Bug: 20822400

Change-Id: I24345c3120440bfce14e8cbe7e880b39f10b744a
2015-05-12 11:02:07 -07:00
Narayan Kamath
5a7587fa90 Fix file descriptor leak when opening invalid archives.
I've inspected all other callers of OpenArchive and this seems
to be the only broken one. The easiest way to reproduce this is
by using getPackageArchiveInfo or by adding an asset path that
isn't a valid APK.

bug: https://code.google.com/p/android/issues/detail?id=171099
Change-Id: I41cd85d20f26ad47968e2a6f1384cc03330b558b
2015-05-12 10:37:18 +00:00
John Reck
9aa7b45e79 Merge "Fix kSkippedFrame setting" into mnc-dev 2015-05-08 21:19:54 +00:00
John Reck
aef9dc8d18 Fix kSkippedFrame setting
It was only set previously if RenderThread dropped the frame,
but not if the UI thread frame was dropped. Unify the
two paths

Change-Id: If2574edde3cb0949deed4e47f3daaddb890a1b28
2015-05-08 14:12:32 -07:00
John Reck
d04794a9a3 Add eglSwapBuffersWithDamageKHR support
BUG: 20761426
Disabled temporarily

Change-Id: I0b6b6f0eebab886145e13fa35aefe76826965cf5
2015-05-08 10:48:57 -07:00
Alan Viverette
6a8c79bb2b Merge "Improve keying for theme caches, rebase system theme on config change" into mnc-dev 2015-05-07 21:19:59 +00:00
John Reck
98ae4dfbbc Fix build
Change-Id: I233f943041ce46b0d69e0e2f5e0dcda9aa9b7d4b
2015-05-07 13:50:55 -07:00
Chih-Hung Hsieh
ff357a9cd4 Merge "Fix clang warnings on unused variable, mismatched tag, print format." into mnc-dev 2015-05-07 20:29:22 +00:00
John Reck
d530a5e5ae Merge "Remove SkBitmap from ResourceCache" into mnc-dev 2015-05-07 20:28:57 +00:00
John Reck
e75ab4c26a Remove SkBitmap from ResourceCache
Bug: 18928352

Fully-proper refcounting via SkBitmap/SkPixelRef, no more
side-channel refcounting via ResourceCache. Makes HWUI
more resilient to the bitmap being modified as well as
the SkBitmap's info & rowBytes() is updated every time
a DisplayList is recorded instead of relying on buggy
cache eviction logic

Change-Id: I2e8292d62ab6c257a2cfa1542387bf2bf1ade816
2015-05-07 13:17:18 -07:00
Chih-Hung Hsieh
9eb9dd326a Fix clang warnings on unused variable, mismatched tag, print format.
BUG: 20890093
Change-Id: I91588f481d80b69823bc9d104b8bd09167ee5373
2015-05-07 12:30:13 -07:00
John Reck
a039182d61 Delete a bunch of dead code
Rotation wasn't supported, so just nuke all the code
around it. Fixes some unused field warnings

Change-Id: Ic33d56ed3b42e3261bddc5007c5a029831254f83
2015-05-07 11:06:46 -07:00
Tim Murray
bfbcd88aee Add frame count option to hwuitest. Also add shadowgrid2 to hwuitest
Change-Id: I069a2836cf1405adfd018ba0a058bf8f4a1cd39c
2015-05-06 13:52:06 -07:00
Tim Murray
1a0f1c7c16 Add loop option to hwuitest.
Change-Id: I15b6b121bd6bd963e5b433bdd93d6dc3e83645b8
2015-05-06 12:22:35 -07:00
Alan Viverette
e54d245b99 Improve keying for theme caches, rebase system theme on config change
Themes now use an array of applied styles rather than a String to store
their history. They are keyed based on a hash code computed from the
history of applied styles. The themed drawable cache has been abstracted
out into its own class.

Also updates system context to use DayNight as the default and ensures
that GlobalActions uses the correct context, which exercises the change.

CTS tests have been added in another CL.

Bug: 20421157
Change-Id: I9eb4b7dffd198ad24d02f656eaf0839570b59caa
2015-05-06 10:41:43 -07:00
Chris Craik
356b177709 Merge "Cleanup properties" into mnc-dev 2015-05-05 21:30:08 +00:00
John Reck
d6abbd29b7 Merge "Dump profile info after running test" into mnc-dev 2015-05-05 21:15:27 +00:00
John Reck
7f2e5e3cea Dump profile info after running test
Bug: 20824843

Not really a proper "benchmark mode" but it turns out
we already have reasonably good profile data, so tweak
the test app to spit it out after a run.

Change-Id: Iaee9c0d61b5508daf282fe5f95d0b37ee419a8f1
2015-05-05 12:18:08 -07:00
Chris Craik
2507c34d91 Cleanup properties
bug:19967854

Separate properties from Caches, into static, RenderThread-only class.

Also rewrites the means for java to set properties to correctly handle
threading, and adds an override for profile bars so that SysUi doesn't clutter
the screen with them.

Change-Id: I6e21a96065f52b9ecc49d1a126244804ba106fa9
2015-05-05 10:36:09 -07:00
John Reck
fe2f7e31be Merge "Add some basic DA unit tests" into mnc-dev 2015-05-05 17:12:02 +00:00
John Reck
d0346cc14e Add some basic DA unit tests
Change-Id: I01e32a8f0db34a27672010cea275de32d7500dd7
2015-05-05 10:03:22 -07:00
Alan Viverette
261208e002 Merge "Add API for obtaining changing configurations bitmask from Theme" into mnc-dev 2015-05-05 16:50:29 +00:00
Alan Viverette
c1d527926e Add API for obtaining changing configurations bitmask from Theme
Required to know when to reload the system context's theme in response
to configuration changes, and thus needed to support the DayNight theme.

Bug: 20267825
Change-Id: I7df5e28b7a6d8b611ea030032544cf4800788514
2015-05-05 09:49:03 -07:00
Prerepa Viswanadham
d1808401ca Merge changes from topic 'mwd-merge-050415' into mnc-dev
* changes:
  Merge commit 'b6f59f4' into master_merge
  Merge commit 'f6db0ce' into master_merge
  Merge commit '17455a3' into master_merge
  Merge commit 'b4d5b32' into master_merge
  Merge commit 'a1a2fa7' into master_merge
  Merge commit '8dfdb98' into master_merge
  Merge commit 'eba66c3' into master_merge
2015-05-05 01:06:38 +00:00
John Reck
a15eedd266 Fix setName use-after-free
Bug: 20764439
Change-Id: I7a0f85bb82629b1302db02015fa493dc09eb31f7
2015-05-04 09:44:28 -07:00
John Reck
7c103a36f6 Remove Bitmap#getSkBitmap
Change-Id: Ifb9047b426122d3e5a445eb7a0eb3fce38dedf27
2015-05-01 14:38:44 -07:00
John Reck
c6e2e8ff47 Move AssetAtlas off of SkBitmap*
Switched to SkPixelRef*

Change-Id: I4a1d9dc6c55c1ebcce6b0b8c585e69559e523898
2015-05-01 14:30:21 -07:00
John Reck
78760b4ae4 Merge "A bunch more cleanups" into mnc-dev 2015-05-01 14:42:51 +00:00
John Reck
3731dc220e A bunch more cleanups
Switch a few places to using android::canvas
instead of SkCanvas as well which eliminated
some JNI

Change-Id: I8f98b56442a06362b82b984cd1bd3a92398d8dbc
2015-04-30 14:34:55 -07:00
Chris Craik
b86f0bc3a7 am 75c4e3e4: am ed375f26: Merge "Fix rendernode flag logging" into mnc-dev
* commit '75c4e3e4d58f310174bbc24e6b2fb058773f8f31':
  Fix rendernode flag logging
2015-04-30 16:39:15 +00:00
Chris Craik
031e69ff81 Fix rendernode flag logging
Change-Id: I978c54ab26ef6dc3f6caef8604ac77a883b8e913
2015-04-30 09:12:44 -07:00
Chris Craik
617b480bcd am 775e94cb: am e74ff81e: Merge "Remove concept of layer alpha override" into mnc-dev
* commit '775e94cbf1536ec18449ae85b3c174633e8b1d31':
  Remove concept of layer alpha override
2015-04-29 22:40:33 +00:00
Chris Craik
e74ff81e05 Merge "Remove concept of layer alpha override" into mnc-dev 2015-04-29 22:16:11 +00:00
Chris Craik
7a6208e24a am 4549108c: am 81bd735a: Merge "Require minimum 4 bit stencil for layers." into mnc-dev
* commit '4549108c46ef1103996ae2f98123d033da54bce6':
  Require minimum 4 bit stencil for layers.
2015-04-29 20:33:53 +00:00
John Reck
6228ea26ef am 108f0a34: am b2cec86a: Merge "Skip frames with no damage" into mnc-dev
* commit '108f0a341ad2176b25df7757f1dc793289b48cc0':
  Skip frames with no damage
2015-04-29 20:33:48 +00:00
Chris Craik
81bd735a01 Merge "Require minimum 4 bit stencil for layers." into mnc-dev 2015-04-29 20:17:43 +00:00
John Reck
b2cec86a44 Merge "Skip frames with no damage" into mnc-dev 2015-04-29 20:10:26 +00:00
Chris Craik
e145013153 Require minimum 4 bit stencil for layers.
bug:19270131
Change-Id: I81367179d268e7c1642259c456c1f3d0018f6c0d
2015-04-29 13:04:02 -07:00
Narayan Kamath
bb4ed9aa3a am 815d9bb1: Merge "Add a static dependency on libbase."
* commit '815d9bb178a0488ed1579cd230d447630ad0891b':
  Add a static dependency on libbase.
2015-04-29 14:38:15 +00:00
Narayan Kamath
9c8ba9666d Add a static dependency on libbase.
Used by libziparchive.

Change-Id: I120494b620c72b36a725b01f1f274f5dc862a9a3
2015-04-29 14:07:41 +00:00
Chris Craik
8df5ffa9ae Remove concept of layer alpha override
bug:19412691
Change-Id: I9e150fe4a1b2c0cf140519a33c02fd4771ef1c50
2015-04-28 17:47:20 -07:00
John Reck
240ff6246a Skip frames with no damage
Bug: 20464038
Change-Id: Iae3aa9baf1d03c3aa443a39373e2bbd4a3910fad
2015-04-28 13:50:00 -07:00
Chris Craik
956f340aac Remove unused flags and dirty rects
bug:17209071

Also update DisplayList->RenderNode naming in Editor

Change-Id: I1d505640ba7388a0b0042d9c787f859e45a24da5
2015-04-28 09:40:01 -07:00
Chris Craik
856f0cc3e3 Promote RenderProperties with an alpha to have a RenderLayer
bug:20254728
Change-Id: I0bd1d440fe46683b291d4c8ab07a630c34b2eadc
2015-04-27 18:12:07 +00:00
Nick Kralevich
2eb10c0075 am 05ad674a: am 00e165ae: am e8101c04: Merge "fix compiler error under FORTIFY_SOURCE=2"
* commit '05ad674aa888e3f9217de0e5c3176161dd8e31aa':
  fix compiler error under FORTIFY_SOURCE=2
2015-04-25 22:05:25 +00:00
Nick Kralevich
9709a1f04c fix compiler error under FORTIFY_SOURCE=2
frameworks/base/libs/androidfw/ObbFile.cpp:340:5: error: ignoring return value of function declared with warn_unused_result attribute [-Werror,-Wunused-result]
    ftruncate(fd, mFooterStart);
    ^~~~~~~~~ ~~~~~~~~~~~~~~~~
1 error generated.
amake: *** [out/host/linux-x86/obj/STATIC_LIBRARIES/libandroidfw_intermediates/ObbFile.o] Error 1

Change-Id: I7080d64e7a830a10b41c1ebf33c60d32b7c8356e
2015-04-24 20:27:06 -07:00
John Reck
b5bc454870 Teach LA how to destroy
Change-Id: I57ab30b6d56370dade6987f442136ea5e5546c9b
2015-04-23 16:04:50 -07:00
John Reck
1ed723723d Move LinearAlloc to libhuwi
Change-Id: I1d8c99bdeef22ca569e1743cff6108f478737bc8
2015-04-23 15:46:28 -07:00
John Reck
c1b33d665c GraphicsJNI Canvas cleanup
Change-Id: I72e142986a8bc9f464c1951b6b5187919de3462e
2015-04-22 09:34:34 -07:00
Chris Craik
2099ee8ab5 Merge "Rename native DisplayListRenderer to DisplayListCanvas" 2015-04-21 16:30:08 +00:00