Commit Graph

9550 Commits

Author SHA1 Message Date
Chih-Hung Hsieh
bd0093e182 Merge "Fix implicit-fallthrough warnings." am: 8f520e6f83
am: a6c90c99cd

Change-Id: I5efd04bf9dae335e03181b6443a3a85e69c1c042
2018-10-24 14:19:26 -07:00
Treehugger Robot
8f520e6f83 Merge "Fix implicit-fallthrough warnings." 2018-10-20 00:15:20 +00:00
Chih-Hung Hsieh
672a4fd863 Fix implicit-fallthrough warnings.
Test: make checkbuild
Bug: 112564944
Change-Id: Iaebada5e1a5d94ed06d9b584b888a4f78c0b8505
2018-10-19 14:19:29 -07:00
Tim Murray
64fee6148b hwui: purge malloc pages on bitmap destruction
Immediately purge malloc pages on bitmap destruction. Bitmaps are often
big and can cause memory to stay high for much longer than it should.

Test: boots and works
bug 117795621

Merged-in: If2e8c5f1fc07039cf3dc3edcd3dc06861dbce1a1
Change-Id: If2e8c5f1fc07039cf3dc3edcd3dc06861dbce1a1
2018-10-18 23:30:35 +00:00
Ryan Prichard
498357670e Merge "Change ZipArchiveHandle from void* to ZipArchive*" am: f79542efd3
am: a34a1e0c97

Change-Id: Icf0d62124d88c87a76edcb9af945a2f327989a15
2018-10-15 21:25:35 -07:00
Ryan Prichard
a34a1e0c97 Merge "Change ZipArchiveHandle from void* to ZipArchive*"
am: f79542efd3

Change-Id: Iebca19f2757ae77c07eca46a721c6966621fea14
2018-10-15 19:06:02 -07:00
Ryan Prichard
3addcd3965 Change ZipArchiveHandle from void* to ZipArchive*
Bug: none
Test: m checkbuild
Exempt-From-Owner-Approval: owner is OOO for another week,
  it's a fairly minor change to this repository
Change-Id: If4cf57619034ab98b06115ca60beb2fb26c4cd19
2018-10-15 23:22:47 +00:00
Mårten Kongstad
dcef167772 Merge "libandroidfw: introduce ExecuteBinary (POSIX only)" am: 120b7fba93
am: 2a656b455d

Change-Id: I307df3a55623e59125a35ea3b23658dd1e08d8a0
2018-10-09 16:39:03 -07:00
Mårten Kongstad
baa40e1691 Merge "libandroidfw: move ConfigDescription from aapt2 to libandroidfw" am: b14c887974
am: b7c0800fa0

Change-Id: I87731a421b2e57e2187875d09fda66098e1ffb7a
2018-10-09 16:33:24 -07:00
Mårten Kongstad
c5e694e954 Merge changes from topic "idmap2-prerequisites" am: 62a5d4249f
am: 7672daf8e5

Change-Id: I2d35a2e73324961bc8c3d82ed1ce7d785335cee7
2018-10-09 16:28:09 -07:00
Mårten Kongstad
2a656b455d Merge "libandroidfw: introduce ExecuteBinary (POSIX only)"
am: 120b7fba93

Change-Id: I6e0b320e8887e32b8ea3fd1cfcf0804714fe1eb3
2018-10-09 16:08:34 -07:00
Mårten Kongstad
b7c0800fa0 Merge "libandroidfw: move ConfigDescription from aapt2 to libandroidfw"
am: b14c887974

Change-Id: I14be80a2d2c3620919a78da5a42ed56ec1d1737f
2018-10-09 16:04:34 -07:00
Mårten Kongstad
7672daf8e5 Merge changes from topic "idmap2-prerequisites"
am: 62a5d4249f

Change-Id: I8db3f5ba0de6510c3327273c56e9fcc75c836694
2018-10-09 16:00:31 -07:00
Treehugger Robot
120b7fba93 Merge "libandroidfw: introduce ExecuteBinary (POSIX only)" 2018-10-09 21:43:38 +00:00
Treehugger Robot
b14c887974 Merge "libandroidfw: move ConfigDescription from aapt2 to libandroidfw" 2018-10-09 21:43:38 +00:00
Treehugger Robot
62a5d4249f Merge changes from topic "idmap2-prerequisites"
* changes:
  AssetManager2: optionally keep non-matching configs
  AAPT2: optionally keep resources without default value
  libandroidfw: add resource ID iterator
2018-10-09 21:43:38 +00:00
Mårten Kongstad
668ec5bd3b AssetManager2: optionally keep non-matching configs
AssetManager2 maintains a set of configurations [as specified in the
resource blob] compatible with the currently set configuration [as
specified via SetConfiguration]. This helps optimize future resource
lookups by limiting the set of configurations to iterate over.

However, when creating idmaps, all configurations must be considered,
including those not compatible with the currently set configuration. Add
an optional flag to SetApkAssets to disable the optimization described
above.

Test: manual (will be tested by upcoming idmap2 implementation)
Change-Id: I7526a323ddf90e2f2f49c36e8c110a2cec25357e
2018-10-09 20:15:01 +00:00
Mårten Kongstad
5c541f6e36 libandroidfw: move ConfigDescription from aapt2 to libandroidfw
This is to allow idmap2 to access ConfigDescription.

Test: libandroidfw_tests
Test: aapt2_tests
Change-Id: I54210bbbd8dad5903cb7100807df977efa394ad5
Merged-In: I54210bbbd8dad5903cb7100807df977efa394ad5
2018-10-08 09:56:09 -07:00
Mårten Kongstad
2503a49b96 libandroidfw: introduce ExecuteBinary (POSIX only)
Introduce a wrapper around fork and exec.

Test: make libandroidfw_tests
Change-Id: Iff0de5319bb6bb101a3fbef6413dfb4e77198f11
2018-10-04 03:45:32 +00:00
Chih-hung Hsieh
07a7250da3 Merge "Add noexcept to move constructors and assignment operators." am: 9166e89374
am: 15dcc77fee

Change-Id: I695e7a175051e2dd42d05c54d859e4d7126620aa
2018-10-01 18:37:02 -07:00
Chih-hung Hsieh
15dcc77fee Merge "Add noexcept to move constructors and assignment operators."
am: 9166e89374

Change-Id: I079060ef610c2d90c57140f001225c163a3dd21a
2018-10-01 18:09:38 -07:00
Chih-Hung Hsieh
fc81626ba6 Add noexcept to move constructors and assignment operators.
Bug: 116614593
Test: build with WITH_TIDY=1
Change-Id: Ic3993d88eb3066aef402d74c4d543c56a1dfd5c3
2018-10-01 20:23:02 +00:00
Mårten Kongstad
3f1f4fc11d libandroidfw: add resource ID iterator
Add an iterator to LoadedPackage which allows the caller to iterate over
the resource IDs in the package. This will be used by idmap when
constructing the idmap file.

Bug: 78815803
Test: make libandroidfw_tests
Change-Id: Ia47daa21390d67ea2ef3665e88eb407837c4764f
2018-09-28 09:40:20 +02:00
John Reck
21013eebd7 Merge "Don't run comparisons on non-jank frames" am: 903dad812e
am: 4007dd103f

Change-Id: I175e245bd2ced35505a2295f4037c6d9c932f056
2018-09-19 18:34:59 -07:00
John Reck
4007dd103f Merge "Don't run comparisons on non-jank frames"
am: 903dad812e

Change-Id: I7cbca9acb9f14149868f18af8970d5324d51e260
2018-09-19 18:21:47 -07:00
Treehugger Robot
903dad812e Merge "Don't run comparisons on non-jank frames" 2018-09-19 23:28:55 +00:00
John Reck
50be3b8378 Don't run comparisons on non-jank frames
Unclear why mSwapDeadline doesn't already
account for this, but the handling of vsync
phase offsets may be throwing things off a bit.

For now just do the simple fix.

Bug: 109894489
Test: builds, patch was verified by reporter
Change-Id: I5a6f25ceac4986d366293fe7b5e3af64a326114c
2018-09-14 11:25:58 -07:00
Stan Iliev
dcedc99ba9 DO NOT MERGE: Use GL_LINEAR filter when drawing scaled TextureView
am: 93ac4012f2

Change-Id: I969216b071ab42b9fa14ce3cfcd2b99a3ecc002c
2018-09-13 02:34:50 -07:00
Mårten Kongstad
0bb76346f5 Merge "ByteBucketArray.h: fix typo"
am: b848ce8e20

Change-Id: I81aff763f5572b6c72e1a845fda518179cf95e15
2018-09-12 16:57:17 -07:00
Treehugger Robot
b848ce8e20 Merge "ByteBucketArray.h: fix typo" 2018-09-12 22:26:22 +00:00
Stan Iliev
93ac4012f2 DO NOT MERGE: Use GL_LINEAR filter when drawing scaled TextureView
Use GL_LINEAR instead of GL_NEAREST sampling, when drawing
a TextureView, which has a buffer size that does not match
layer size.
Scale SkImage to layer size with a matrix, instead of
passing wrong size to MakeFromTexture.
This CL must not be merged in master, becase this issue has
been fixed already by ag/4936023.

Bug: 114324288
Test: Passed CtsViewTestCases and CtsUiRenderingTestCases
Test: Ran apps using scaled TextureView including Instagram
Change-Id: I9ee659d08998c932d8b708a64f3c879ab696fd9e
2018-09-11 20:45:23 +00:00
Mårten Kongstad
cb54cd2dac ByteBucketArray.h: fix typo
Bug: 78815803
Test: builds, boots
Change-Id: I93d7ce5255911797d6afdb05caf0cf7dbfdc22b9
2018-09-11 14:24:40 +02:00
Stan Iliev
cccd03859c Don't apply filter in readback, when there is no scaling
Fix check for scaling in SkiaOpenGLReadback: old code was not
taking into account that matrix rotation swaps width/height.

Test: Passed PixelCopyTest#testWindowProducerCopyToRGBA16F
Bug: 110097060
Bug: 111776948
Change-Id: I0d26416fa72a026bc376417773d5a73548b1f1a5
Merged-In: I0d26416fa72a026bc376417773d5a73548b1f1a5
(cherry picked from commit d50edd004b)
(cherry picked from commit ee7b63aa646c937e326ac5f39f07f724020533bb)
2018-08-29 15:03:08 +08:00
Stan Iliev
421449a4a6 Fix TextureView.getBitmap with scale layer transform
Fix TextureView.getBitmap to capture content only from the layer.

Bug: 111401911
Test: A new test TextureViewTest.testTransformScale is passing
Change-Id: I2b9cee17fc48de7b12ed03d5b4f173ce5445dbfe
Merged-In: I2b9cee17fc48de7b12ed03d5b4f173ce5445dbfe
(cherry-picked from ff129aefe2)
(cherry picked from commit 9675537555913a6aa7c25a71a6b854a083e22ede)
2018-08-29 14:54:53 +08:00
Greg Kaiser
ddedd24e96 Merge changes Ie072511b,I6424f90c
am: 9d10637e01

Change-Id: I06ca7319633534e38b45ab960f285a072cff84da
2018-08-24 15:38:07 -07:00
Greg Kaiser
174b50fa50 TreeInfo: Make ~ErrorHandler() virtual
ErrorHandler has a pure virtual function, so we also make its
destructor virtual, to assure any children classes will get
properly destructed.

Test: TreeHugger
Change-Id: Ie072511b450d507f8764b0888d232ffac8f6d6f5
2018-08-24 06:10:18 -07:00
Greg Kaiser
a95435b836 RenderThread: Make ~IFrameCallback() virtual
IFrameCallback has a pure virtual method, but its destructor was
non-virtual.  While CanvasContext, which inherits from
IFrameCallback, declares its own destructor virtual, this is not
sufficient when accessing via an IFrameCallback pointer.

We fix this by making the base destructor virtual.

Test: Treehugger
Change-Id: I6424f90c16caea417b5f80b60d76a7ca7c7ef97c
2018-08-23 17:07:56 -07:00
Stan Iliev
0678660c8d Merge "Fix TextureView.getBitmap with scale layer transform" into pi-dev
am: f5d4ea6132

Change-Id: I76c8480c0ce5583ce75a91d665862032415c54d8
2018-07-18 16:54:22 -07:00
TreeHugger Robot
f5d4ea6132 Merge "Fix TextureView.getBitmap with scale layer transform" into pi-dev 2018-07-18 23:39:26 +00:00
Jorim Jaggi
c9756c9193 Merge "Move allocateBuffers to RT" into pi-dev
am: 2f8a3a4bb8

Change-Id: I6c8f84406a40fa324a4486f71fccf01f6acfe60a
2018-07-18 15:06:29 -07:00
Jorim Jaggi
2f8a3a4bb8 Merge "Move allocateBuffers to RT" into pi-dev 2018-07-18 21:47:59 +00:00
Jorim Jaggi
7823ee73ee Move allocateBuffers to RT
Such that it gets executed after setSurface, in order that
mReqUsage has the correct flags set.

Test: Take trace, ensure that allocateBuffers actually allocates
in the right format/usage by ensuring that dequeueBuffer doesn't
trash them immediately again.
Bug: 111517695
Change-Id: I94b402d7b29d565155a77a2d09106246261712d2
2018-07-17 17:34:49 +02:00
Todd Kennedy
60413d0697 Merge "Loosen resource file verification" into pi-dev
am: cf0b127110

Change-Id: I0b4012085579aa172a1a3f5a83325f0827523af5
2018-07-16 14:15:09 -07:00
Stan Iliev
ff129aefe2 Fix TextureView.getBitmap with scale layer transform
Fix TextureView.getBitmap to capture content only from the layer.

Bug: 111401911
Test: A new test TextureViewTest.testTransformScale is passing
Change-Id: I2b9cee17fc48de7b12ed03d5b4f173ce5445dbfe
2018-07-16 21:03:39 +00:00
Todd Kennedy
28e663cbed Loosen resource file verification
Bug: 77808145
Test: Tried to install corrupt APK prior to the change, install failed
Test: Tried to install corrupt APK after the change, install succeeded
Test: atest CtsAppSecurityHostTestCases:CorruptApkTests
Change-Id: I19a69e52a17c1080beaf2cc575c32f564b1033a3
2018-07-16 20:52:55 +00:00
John Reck
888f73388b Merge "Disable LTO on -eng" am: 1918b39942
am: af3e763358

Change-Id: I5146424fc06ad7c62088a0ac6f957e0a02b0ec66
2018-07-11 15:09:34 -07:00
John Reck
af3e763358 Merge "Disable LTO on -eng"
am: 1918b39942

Change-Id: I925182b722d7bf6b1bb63c298a8ec9e345f0c4ac
2018-07-11 14:48:50 -07:00
John Reck
2729418128 Disable LTO on -eng
Speeds up incremental compile of one cpp file change
from over a minute to around 15 seconds

Bug: 111277863
Test: touch a .cpp file in hwui & mmm
Change-Id: I946ecad411a7a59f87ed9e1eeb146d6f57bd038a
2018-07-11 18:24:58 +00:00
Haibo Huang
6fc2f09b35 Merge "Remove CSV support" am: 0faecf7b89
am: 9fada2364f

Change-Id: Ibf1fe01c8e69407decf760307ad3747f1c3cb317
2018-07-09 15:44:54 -07:00
Haibo Huang
9fada2364f Merge "Remove CSV support"
am: 0faecf7b89

Change-Id: I02e8b74299afda2642567e3fcf9a41653cb7b888
2018-07-09 14:41:03 -07:00