Robert Shih
40ba03fc68
IGraphicBufferProducer: fix QUEUE_BUFFER info leak am: d06421fd37
am: 413318311c
am: dc9ec35294
am: 9d959e2755
am: edb7c81a1b
...
am: 2a7a1247cb
* commit '2a7a1247cb4829daaaa4e6a6ee3e670cd2f068bf':
IGraphicBufferProducer: fix QUEUE_BUFFER info leak
2016-01-15 01:54:27 +00:00
Robert Shih
2a7a1247cb
IGraphicBufferProducer: fix QUEUE_BUFFER info leak am: d06421fd37
am: 413318311c
am: dc9ec35294
am: 9d959e2755
...
am: edb7c81a1b
* commit 'edb7c81a1b99d2456910b03db9e4ac250eac2fab':
IGraphicBufferProducer: fix QUEUE_BUFFER info leak
2016-01-15 01:52:25 +00:00
Robert Shih
edb7c81a1b
IGraphicBufferProducer: fix QUEUE_BUFFER info leak am: d06421fd37
am: 413318311c
am: dc9ec35294
...
am: 9d959e2755
* commit '9d959e275561bcace3aab1f9df009c6c880003fa':
IGraphicBufferProducer: fix QUEUE_BUFFER info leak
2016-01-15 01:50:22 +00:00
Robert Shih
ec87aa5218
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak am: dded8fdbb7
am: 7ee203b59d
am: dc252255af
...
am: 202aaa8f97
* commit '202aaa8f97083b68c0a736f4cd432f61c9b0989d':
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak
2016-01-15 01:48:17 +00:00
Robert Shih
202aaa8f97
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak am: dded8fdbb7
am: 7ee203b59d
...
am: dc252255af
* commit 'dc252255af835bb3a69bc9a0d01da12419c0fc05':
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak
2016-01-15 01:45:18 +00:00
Robert Shih
9d959e2755
IGraphicBufferProducer: fix QUEUE_BUFFER info leak am: d06421fd37
am: 413318311c
...
am: dc9ec35294
* commit 'dc9ec35294b8ec6b6c349b826edc9b44f4ddb96d':
IGraphicBufferProducer: fix QUEUE_BUFFER info leak
2016-01-15 01:45:18 +00:00
Robert Shih
dc252255af
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak am: dded8fdbb7
...
am: 7ee203b59d
* commit '7ee203b59d9a74d485ce2fdfd07e96b2d10ff23b':
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak
2016-01-15 01:43:05 +00:00
Robert Shih
dc9ec35294
IGraphicBufferProducer: fix QUEUE_BUFFER info leak am: d06421fd37
...
am: 413318311c
* commit '413318311c8cc356dd7e0837ce26e937a9f4c56a':
IGraphicBufferProducer: fix QUEUE_BUFFER info leak
2016-01-15 01:38:56 +00:00
Robert Shih
413318311c
IGraphicBufferProducer: fix QUEUE_BUFFER info leak
...
am: d06421fd37
* commit 'd06421fd37fbb7fd07002e6738fac3a223cb1a62':
IGraphicBufferProducer: fix QUEUE_BUFFER info leak
2016-01-15 01:27:23 +00:00
Robert Shih
7ee203b59d
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak
...
am: dded8fdbb7
* commit 'dded8fdbb700d6cc498debc69a780915bc34d755':
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak
2016-01-15 01:26:59 +00:00
Robert Shih
d06421fd37
IGraphicBufferProducer: fix QUEUE_BUFFER info leak
...
Bug: 26338109
Change-Id: I8a979469bfe1e317ebdefa43685e19f9302baea8
2016-01-11 16:33:17 -08:00
Robert Shih
dded8fdbb7
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak
...
Bug: 26338113
Change-Id: I019c4df2c6adbc944122df96968ddd11a02ebe33
2016-01-11 11:47:42 -08:00
Lajos Molnar
37b8c1f77c
Merge "OMX: clarify EOS signaling for tunneled decoders" into mnc-dev
...
am: f1de4547c1
* commit 'f1de4547c14467c03b00187efde5381dd1fb265c':
OMX: clarify EOS signaling for tunneled decoders
2015-11-13 00:07:04 +00:00
Lajos Molnar
f1de4547c1
Merge "OMX: clarify EOS signaling for tunneled decoders" into mnc-dev
2015-11-13 00:00:19 +00:00
Peng Xu
a78c2e65e1
Merge "Avoiding flush on-change sensors at subscription" into mnc-dr-dev
2015-10-27 22:23:21 +00:00
Peng Xu
20483c4937
Avoiding flush on-change sensors at subscription
...
Initial sensor flush at subscription is a mechanism to avoid sensors
to get stale samples before subscription happens. However, there is a
slight chance that a most recent sample will be lost during the flush
process. This is OK for continuous sensors but problematic in
on-change sensor as on-change event does not come continuously and
a lost event can cause inconsistent state in client. Flush at
subscription of on-change sensor is disabled in this CL to avoid new
important on-change event to be discarded during the initial flush
process.
Bugs: b/24647069
b/25241873
b/24804819
Change-Id: Ibda099c6b9f5fb6e200f13cf13a850b0026e9e7c
2015-10-27 21:46:40 +00:00
Nick Kralevich
574145ea31
DO NOT MERGE: fix build try #2 am: 778b6f4902
am: 034bc1799c
-s ours am: dbc9a47831
-s ours am: a2685ebb1e
am: 1d94a1d036
-s ours
...
am: bce101e79b
* commit 'bce101e79b5ee9715a8329db8fd760f7ba829de1':
DO NOT MERGE: fix build try #2
2015-10-23 21:22:14 +00:00
Adrian Roos
cf33d50d25
Merge changes from topic 'parcel-v2' into mnc-dr-dev
...
* changes:
Maintain Parcel ABI
Revert "Revert "Track ashmem memory usage in Parcel""
2015-10-23 17:21:23 +00:00
Nick Kralevich
bce101e79b
DO NOT MERGE: fix build try #2 am: 778b6f4902
am: 034bc1799c
-s ours am: dbc9a47831
-s ours am: a2685ebb1e
...
am: 1d94a1d036
-s ours
* commit '1d94a1d036cb4bc8d9b178f56fa3bbddc81b7f10':
DO NOT MERGE: fix build try #2
2015-10-23 04:36:16 +00:00
Nick Kralevich
1d94a1d036
DO NOT MERGE: fix build try #2 am: 778b6f4902
am: 034bc1799c
-s ours am: dbc9a47831
-s ours
...
am: a2685ebb1e
* commit 'a2685ebb1ec5ed523fb4800d2593f2ae0c10ed22':
DO NOT MERGE: fix build try #2
2015-10-23 04:32:47 +00:00
Nick Kralevich
a2685ebb1e
DO NOT MERGE: fix build try #2 am: 778b6f4902
am: 034bc1799c
-s ours
...
am: dbc9a47831
-s ours
* commit 'dbc9a478311e8728c8148a80abb103fca697891d':
DO NOT MERGE: fix build try #2
2015-10-23 04:26:03 +00:00
Nick Kralevich
18e7c64ea8
resolve merge conflicts of 834ac204ce
to klp-modular-dev. am: 7f1ea80d65
am: fa632f6ad7
am: 9ec978732f
am: 1b28b05d2e
...
am: 0370a03b6e
* commit '0370a03b6e74e40d5110b83fed2243bf072aee73':
DO NOT MERGE: fix build breakage
2015-10-23 04:19:58 +00:00
Nick Kralevich
dbc9a47831
DO NOT MERGE: fix build try #2 am: 778b6f4902
...
am: 034bc1799c
-s ours
* commit '034bc1799cbbc4184aa507eba181573c0a3b9b35':
DO NOT MERGE: fix build try #2
2015-10-23 04:19:51 +00:00
Flanker
711c7becb0
add number constraint for samples per MotionEvent am: 5d17838ade
am: 72c8ca4a01
am: 9964d83869
am: 90dc6dc825
am: 9830f11dc6
...
am: a82ace99f7
* commit 'a82ace99f76ed815e16ab64eae2e9e55871a8b8f':
add number constraint for samples per MotionEvent
2015-10-23 04:19:51 +00:00
Nick Kralevich
0370a03b6e
resolve merge conflicts of 834ac204ce
to klp-modular-dev. am: 7f1ea80d65
am: fa632f6ad7
am: 9ec978732f
...
am: 1b28b05d2e
* commit '1b28b05d2edf11f49717b53cd49a9161892f0388':
DO NOT MERGE: fix build breakage
2015-10-23 04:15:24 +00:00
Nick Kralevich
034bc1799c
DO NOT MERGE: fix build try #2
...
am: 778b6f4902
* commit '778b6f4902ad824d5fc62071caaa837bb47deee5':
DO NOT MERGE: fix build try #2
2015-10-23 04:15:21 +00:00
Nick Kralevich
1b28b05d2e
resolve merge conflicts of 834ac204ce
to klp-modular-dev. am: 7f1ea80d65
am: fa632f6ad7
...
am: 9ec978732f
* commit '9ec978732f8dd82e7adef3e37097eaca3fbd65f0':
DO NOT MERGE: fix build breakage
2015-10-23 02:02:42 +00:00
Nick Kralevich
9ec978732f
resolve merge conflicts of 834ac204ce
to klp-modular-dev. am: 7f1ea80d65
...
am: fa632f6ad7
* commit 'fa632f6ad7be6b1f488dd3d1b825a82456db5097':
DO NOT MERGE: fix build breakage
2015-10-23 01:52:34 +00:00
Nick Kralevich
fa632f6ad7
resolve merge conflicts of 834ac204ce
to klp-modular-dev.
...
am: 7f1ea80d65
* commit '7f1ea80d65996ab687ff56a884da915535cdc176':
DO NOT MERGE: fix build breakage
2015-10-23 01:44:26 +00:00
Adrian Roos
6bb3114246
Maintain Parcel ABI
...
Makes sure we don't change the memory layout of the Parcel class
to maintain binary compatibility with prebuilts linking against
libbinder.
Bug: 25004154
Change-Id: I656687497f08bb85cefda796aafa2341e601e30a
2015-10-22 17:48:16 -07:00
Adrian Roos
cbf3726357
Revert "Revert "Track ashmem memory usage in Parcel""
...
This reverts commit 6880307e8e
.
Bug: 25004154
Change-Id: I9b432d1ebc39f3bbcd7afdefc403f0fb6ced8158
2015-10-22 17:47:27 -07:00
Nick Kralevich
7f1ea80d65
resolve merge conflicts of 834ac204ce
to klp-modular-dev.
...
Bug: 23905002
Change-Id: Ic7262861af91a8fff27692c0f68761cb3ab12aa3
2015-10-22 17:26:28 -07:00
Flanker
a82ace99f7
add number constraint for samples per MotionEvent am: 5d17838ade
am: 72c8ca4a01
am: 9964d83869
am: 90dc6dc825
...
am: 9830f11dc6
* commit '9830f11dc6b6aa4001c79147966fdb9eaa71c2f2':
add number constraint for samples per MotionEvent
2015-10-22 22:28:01 +00:00
Ian Pedowitz
6880307e8e
Revert "Track ashmem memory usage in Parcel"
...
This reverts commit e2f499fb73
.
Bug: 25169267
Bug: 25191602
Bug: 25004154
Change-Id: I24bb0da4e8739ee5a0c251e4adac9904827144e0
2015-10-22 22:09:16 +00:00
Nick Kralevich
778b6f4902
DO NOT MERGE: fix build try #2
...
On klp-dev, UINT16_MAX isn't available unless __STDINT_LIMITS
is defined, which it's not for this code. This isn't relevant
for later branches due to bionic commit
e2a292d278b94fec3d078b1f1b27c1f89942c276
Don't use UINT16_MAX when we can just hardcode 65535.
Bug: 23905002
Change-Id: Ia1fd0f749cb7a4d19866075abc28ed6960424e54
2015-10-22 14:50:53 -07:00
Nick Kralevich
834ac204ce
DO NOT MERGE: fix build breakage
...
fix klp-dev only build breakage.
frameworks/native/libs/input/Input.cpp: In member function 'android::status_t android::MotionEvent::readFromParcel(android::Parcel*)':
frameworks/native/libs/input/Input.cpp:494:47: error: 'UINT16_MAX' was not declared in this scope
Bug: 23905002
Change-Id: I4b6b864ca64d39a8873d045a61e0ddaea2ab9109
2015-10-22 07:09:23 -07:00
Flanker
9830f11dc6
add number constraint for samples per MotionEvent am: 5d17838ade
am: 72c8ca4a01
am: 9964d83869
...
am: 90dc6dc825
* commit '90dc6dc825ebd1f0f4c9474fad887cd7eac8e9bd':
add number constraint for samples per MotionEvent
2015-10-22 02:15:13 +00:00
Flanker
90dc6dc825
add number constraint for samples per MotionEvent am: 5d17838ade
am: 72c8ca4a01
...
am: 9964d83869
* commit '9964d83869565cf4dda432129cfe50f6ede19338':
add number constraint for samples per MotionEvent
2015-10-22 02:10:12 +00:00
Flanker
9964d83869
add number constraint for samples per MotionEvent am: 5d17838ade
...
am: 72c8ca4a01
* commit '72c8ca4a0191827fd3265c0820b685a6cf420be1':
add number constraint for samples per MotionEvent
2015-10-22 02:04:55 +00:00
Flanker
72c8ca4a01
add number constraint for samples per MotionEvent
...
am: 5d17838ade
* commit '5d17838adef13062717322e79d4db0b9bb6b2395':
add number constraint for samples per MotionEvent
2015-10-22 02:02:46 +00:00
Adrian Roos
e2f499fb73
Track ashmem memory usage in Parcel
...
Bug: 25004154
Change-Id: Id9d5656dd0605f1b50525596b75601309f67ebdc
2015-10-21 22:32:35 +00:00
Flanker
5d17838ade
add number constraint for samples per MotionEvent
...
Bug:23905002
Signed-off-by: Adam Lesinski <adamlesinski@google.com>
(cherry picked from commit 552a8a5d8d
)
Change-Id: I9b7ea859889b7697bee4165a2746602212120543
2015-10-20 12:28:15 -07:00
Naveen Leekha
7135d2768b
am 18165848
: am e2c4f4fb
: am c1e6fbb5
: Initialize local variables to avoid data leak am: 7534e4e63a
-s ours am: 7b4863f606
...
am: 8121177b5e
* commit '8121177b5e8c406570f0eaf6593c6fd1db232ddf':
Initialize local variables to avoid data leak
2015-10-20 17:02:33 +00:00
Naveen Leekha
8121177b5e
am 18165848
: am e2c4f4fb
: am c1e6fbb5
: Initialize local variables to avoid data leak am: 7534e4e63a
-s ours
...
am: 7b4863f606
* commit '7b4863f606bdb48b188b0235447dfaba6c8c3cf0':
Initialize local variables to avoid data leak
2015-10-20 16:54:09 +00:00
Naveen Leekha
7b4863f606
am 18165848
: am e2c4f4fb
: am c1e6fbb5
: Initialize local variables to avoid data leak
...
am: 7534e4e63a
-s ours
* commit '7534e4e63afedeb826a8d8a4b0cf3f9d40d243ea':
Initialize local variables to avoid data leak
2015-10-20 16:42:34 +00:00
Aravind Akella
2ac7405bda
Merge "Set DATA_INJECTION mode flag for sensors." into mnc-dr-dev
2015-10-14 21:03:07 +00:00
Jesse Hall
312d7555cb
egl: Remove window disconnect before calling driver eglDestroySurface
...
This was originally added for b/14445579. An in-development app was
attempting to render to a window as an EGLSurface, then tear that
down, change some window properties, and create a new EGLSurface. The
second eglCreateWindowSurface failed because the window was already
connected. This change went in, but it turned out the real problem was
that the app still (unintentionally) had the surface current. After
the app bug was fixed, nobody revisited whether this change was
actually needed.
Turns out it wasn't needed. After an EGLSurface is both destroyed
*AND* not current (basically refcount==0), we were already
disconnecting the window in ~egl_surface_t().
Apart from being unnecessary and redundant, disconnecting the window
here is wrong for two reasons:
(a) The surface may still be in use after eglDestroySurface, if it was
still current. Rendering is undefined in that case, but disconnecting
the window leads to more catastrophic results than necessary.
(b) It's being called before calling the driver's eglDestroySurface.
The driver will almost definitely have a buffer dequeued that it needs
to cancel, and by disconnecting first we turn that into an error that
they don't have a graceful way to deal with.
Bug: 24524053
Change-Id: Ib063134413d25d3526f794aafb5e333e3417ea42
2015-10-14 11:21:25 -07:00
Adam Lesinski
16b0ae105e
Merge "add number constraint for samples per MotionEvent" into mnc-dr-dev
2015-10-12 22:15:50 +00:00
Flanker
552a8a5d8d
add number constraint for samples per MotionEvent
...
Bug:23905002
Change-Id: Ifd24802977c3dcdd1dbc5120a78aac41beae4603
Signed-off-by: Adam Lesinski <adamlesinski@google.com>
2015-10-12 11:22:37 -07:00
Puneet Kumar
a2f78b44ee
Merge "Inputflinger: hook up key event replacement processing" into mnc-dr-dev
2015-10-08 08:16:58 +00:00