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
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
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
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
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
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
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
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
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
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
7534e4e63a
am 18165848: am e2c4f4fb: am c1e6fbb5: Initialize local variables to avoid data leak
...
* commit '18165848e86feab8656bfdac3173bccf45a9a6df':
Initialize local variables to avoid data leak
2015-09-24 22:20:05 +00:00
Naveen Leekha
18165848e8
am e2c4f4fb: am c1e6fbb5: Initialize local variables to avoid data leak
...
* commit 'e2c4f4fb8b34e36a4f2760f3812c942604cabfb6':
Initialize local variables to avoid data leak
2015-09-24 22:04:48 +00:00
Naveen Leekha
73887c0864
am b414255f: Initialize local variables to avoid data leak
...
* commit 'b414255f53b560a06e642251535b019327ba0d7b':
Initialize local variables to avoid data leak
2015-09-24 22:00:33 +00:00
Naveen Leekha
e2c4f4fb8b
am c1e6fbb5: Initialize local variables to avoid data leak
...
* commit 'c1e6fbb52c3f85cc7610d1d07d12be38f70b4ed4':
Initialize local variables to avoid data leak
2015-09-24 22:00:13 +00:00
Naveen Leekha
b414255f53
Initialize local variables to avoid data leak
...
The uninitialized local variables pick up
whatever the memory content was there on stack.
This data gets sent to the remote process in
case of a failed transaction, which is a security
issue. Fixed.
(Partial manual merge of master change
12ba0f57d028a9c8f4eb3afddc326b70677d1e0c. Rest
to automerge from klp-dev)
For b/23696300
Change-Id: I704c9fab327b3545c58e8a9a96ac542eb7469c2a
2015-09-22 18:04:44 -07:00
Naveen Leekha
c1e6fbb52c
Initialize local variables to avoid data leak
...
The uninitialized local variables pick up
whatever the memory content was there on stack.
This data gets sent to the remote process in
case of a failed transaction, which is a security
issue. Fixed.
(Manual merge of master change
12ba0f57d028a9c8f4eb3afddc326b70677d1e0c )
For b/23696300
Change-Id: I665212d10da56f0803b5bb772d14c77e632ba2ab
2015-09-22 17:58:21 -07:00
Christopher Tate
c1d8af50c3
am 3a9b9aec: am dc3d6af9: am bb686c25: Disregard alleged binder entities beyond parcel bounds
...
* commit '3a9b9aec7a0c04b74a278be5773fcfdaa2a04f4e':
Disregard alleged binder entities beyond parcel bounds
2015-07-02 02:07:24 +00:00
Christopher Tate
3a9b9aec7a
am dc3d6af9: am bb686c25: Disregard alleged binder entities beyond parcel bounds
...
* commit 'dc3d6af97d521678981c773ad9f4e1da088d7870':
Disregard alleged binder entities beyond parcel bounds
2015-07-02 01:42:09 +00:00
Christopher Tate
dc3d6af97d
am bb686c25: Disregard alleged binder entities beyond parcel bounds
...
* commit 'bb686c25b214edadd1830abd056db2d570d716ff':
Disregard alleged binder entities beyond parcel bounds
2015-07-02 01:31:09 +00:00
Christopher Tate
0804ed8e60
am 1b8a2f82: Disregard alleged binder entities beyond parcel bounds
...
* commit '1b8a2f82fedffbc0b24c884def197db392b16576':
Disregard alleged binder entities beyond parcel bounds
2015-07-02 01:29:18 +00:00
Christopher Tate
bb686c25b2
Disregard alleged binder entities beyond parcel bounds
...
When appending one parcel's contents to another, ignore binder
objects within the source Parcel that appear to lie beyond the
formal bounds of that Parcel's data buffer.
Bug 17312693
Change-Id: If592a260f3fcd9a56fc160e7feb2c8b44c73f514
(cherry picked from commit 27182be9f2
)
2015-06-24 20:46:58 +00:00
Christopher Tate
2f340be345
Disregard alleged binder entities beyond parcel bounds
...
When appending one parcel's contents to another, ignore binder
objects within the source Parcel that appear to lie beyond the
formal bounds of that Parcel's data buffer.
Bug 17312693
Change-Id: If592a260f3fcd9a56fc160e7feb2c8b44c73f514
(cherry picked from commit 27182be9f2
)
2015-06-24 20:46:38 +00:00
Christopher Tate
1b8a2f82fe
Disregard alleged binder entities beyond parcel bounds
...
When appending one parcel's contents to another, ignore binder
objects within the source Parcel that appear to lie beyond the
formal bounds of that Parcel's data buffer.
Bug 17312693
Change-Id: If592a260f3fcd9a56fc160e7feb2c8b44c73f514
(cherry picked from commit 27182be9f2
)
2015-06-24 20:46:05 +00:00
Adam Lesinski
2c4f5fdeca
am 861c3f56: am 9004e7f5: am 4ff0cb44: Verify that the native handle was created
...
* commit '861c3f56157813627467054f488ecff7d339f2b0':
Verify that the native handle was created
2015-05-28 21:11:44 +00:00
Adam Lesinski
861c3f5615
am 9004e7f5: am 4ff0cb44: Verify that the native handle was created
...
* commit '9004e7f5516c5b4a1b4178fa6a8bb4b3ca4ddcd0':
Verify that the native handle was created
2015-05-28 20:40:46 +00:00
Adam Lesinski
9004e7f551
am 4ff0cb44: Verify that the native handle was created
...
* commit '4ff0cb4404db31576cd8a81ca5ef3b044d492904':
Verify that the native handle was created
2015-05-28 20:26:02 +00:00
Adam Lesinski
4ff0cb4404
Verify that the native handle was created
...
The inputs to native_handle_create can cause an overflowed allocation,
so check the return value of native_handle_create before accessing
the memory it returns.
Bug:19334482
Change-Id: I1f489382776c2a1390793a79dc27ea17baa9b2a2
(cherry picked from commit eaac99a717
)
2015-05-13 17:16:00 +00:00
Michael Lentine
e86f7e96a7
am 3c0272ba: am dc2d031a: am da9fd70d: am 2758eb2e: am fde92eb0: Update maxNumber to be smaller.
...
* commit '3c0272ba8fbb98b5f1d45c52b1ae5292a8978e7d':
Update maxNumber to be smaller.
2015-02-19 00:47:06 +00:00
Michael Lentine
3c0272ba8f
am dc2d031a: am da9fd70d: am 2758eb2e: am fde92eb0: Update maxNumber to be smaller.
...
* commit 'dc2d031a7ee05725ad3d8cab4887d6c7a4063967':
Update maxNumber to be smaller.
2015-02-19 00:32:42 +00:00
Michael Lentine
dc2d031a7e
am da9fd70d: am 2758eb2e: am fde92eb0: Update maxNumber to be smaller.
...
* commit 'da9fd70de125b0e6df4fb6285f538be9133c7b22':
Update maxNumber to be smaller.
2015-02-19 00:25:34 +00:00
Michael Lentine
da9fd70de1
am 2758eb2e: am fde92eb0: Update maxNumber to be smaller.
...
* commit '2758eb2e67d935cf1f04e3d713438c6ac7fe8b89':
Update maxNumber to be smaller.
2015-02-19 00:15:40 +00:00
Michael Lentine
2758eb2e67
am fde92eb0: Update maxNumber to be smaller.
...
* commit 'fde92eb0ffcc37106d5fe85bf1f1ba30d8639d17':
Update maxNumber to be smaller.
2015-02-19 00:10:11 +00:00
Michael Lentine
fde92eb0ff
Update maxNumber to be smaller.
...
There shouldn't be more than 4096 fds (probably signficantly smaller) and
there shouldn't be more than 4096 ints.
Bug: 18076253
Change-Id: I3a3e50ee3078a4710e9737114e65afc923ed0573
2015-02-18 10:34:37 -08:00
Lajos Molnar
9b6be8e10b
Revert "omx: add Intel's SemiPlanar OMX color format that is used on some devices"
...
This reverts commit 61b17d64f90b85fd367ea1c7609cac69485957d4.
Bug: 19317169
Change-Id: Ib1fcc26c46a52c848ffa8238ddbf6abfe57cfa5d
2015-02-11 09:58:58 -08:00
Lajos Molnar
d25be0ea48
DO NOT MERGE: omx: add OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar
...
This seems to have the same layout as OMX_COLOR_FormatYUV420SemiPlanar,
but used under this value on some devices.
Bug: 19246722
Change-Id: Ib866024e52cf7b12608f02eefc43c6d58a1c0aa1
2015-02-06 19:26:50 +00:00
Lajos Molnar
ea5da67d90
add bUsingNativeBuffers to DescribeColorFormatParams
...
This is needed to find proper color format for flex-YUV native
buffer support.
Bug: 19179927
Change-Id: I91ae6764e302c4307a0750c1d6820506d735c942
2015-01-30 12:02:20 -08:00
Lajos Molnar
94ee9b5916
Merge "CpuConsumer: lock buffers that could be YUV as ycbcr" into lmp-mr1-dev
2015-01-29 07:53:58 +00:00
Lajos Molnar
6a26be7c2b
CpuConsumer: lock buffers that could be YUV as ycbcr
...
Bug: 17906609
Change-Id: Ic71af69ec3b19ab1224ed3ad5e0a97c60e81cda6
2015-01-28 16:52:43 -08:00
Lajos Molnar
1f9f71e183
GraphicBufferMapper: handle devices that do not implement lock_ycbcr
...
Bug: 19179927
Change-Id: I09ffca954fed3cd2d3466c8396627dc7dbc0052d
2015-01-28 16:26:36 -08:00
Michael Lentine
d6fce7ab66
Merge "Remove lock around ref count check in terminate." into lmp-mr1-dev
2015-01-28 22:23:06 +00:00
Michael Lentine
54466bc441
Remove lock around ref count check in terminate.
...
Replace the global lock in terminate for the ref count check with atomics and a
local lock.
Bug: 19072064
Change-Id: I0cfd6564e227a75b8387a8788b16381d5bc2cc88
2015-01-28 11:54:15 -08:00
Dan Stoza
1665c8e101
Revert "SurfaceFlinger: Attempt to attribute fds to layers"
...
This reverts commit 03eccb6616
.
Change-Id: I4f0da7bb62bf77bb3d399aee601beae5e03928fe
2015-01-27 11:03:50 -08:00