OSDN Git Service
Robert Shih [Fri, 15 Jan 2016 01:50:22 +0000 (01:50 +0000)]
IGraphicBufferProducer: fix QUEUE_BUFFER info leak am:
d06421fd37 am:
413318311c am:
dc9ec35294
am:
9d959e2755
* commit '
9d959e275561bcace3aab1f9df009c6c880003fa':
IGraphicBufferProducer: fix QUEUE_BUFFER info leak
Robert Shih [Fri, 15 Jan 2016 01:45:18 +0000 (01:45 +0000)]
IGraphicBufferProducer: fix QUEUE_BUFFER info leak am:
d06421fd37 am:
413318311c
am:
dc9ec35294
* commit '
dc9ec35294b8ec6b6c349b826edc9b44f4ddb96d':
IGraphicBufferProducer: fix QUEUE_BUFFER info leak
Robert Shih [Fri, 15 Jan 2016 01:43:05 +0000 (01:43 +0000)]
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak am:
dded8fdbb7
am:
7ee203b59d
* commit '
7ee203b59d9a74d485ce2fdfd07e96b2d10ff23b':
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak
Robert Shih [Fri, 15 Jan 2016 01:38:56 +0000 (01:38 +0000)]
IGraphicBufferProducer: fix QUEUE_BUFFER info leak am:
d06421fd37
am:
413318311c
* commit '
413318311c8cc356dd7e0837ce26e937a9f4c56a':
IGraphicBufferProducer: fix QUEUE_BUFFER info leak
Robert Shih [Fri, 15 Jan 2016 01:27:23 +0000 (01:27 +0000)]
IGraphicBufferProducer: fix QUEUE_BUFFER info leak
am:
d06421fd37
* commit '
d06421fd37fbb7fd07002e6738fac3a223cb1a62':
IGraphicBufferProducer: fix QUEUE_BUFFER info leak
Robert Shih [Fri, 15 Jan 2016 01:26:59 +0000 (01:26 +0000)]
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak
am:
dded8fdbb7
* commit '
dded8fdbb700d6cc498debc69a780915bc34d755':
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak
Robert Shih [Mon, 11 Jan 2016 23:02:12 +0000 (15:02 -0800)]
IGraphicBufferProducer: fix QUEUE_BUFFER info leak
Bug:
26338109
Change-Id: I8a979469bfe1e317ebdefa43685e19f9302baea8
Robert Shih [Mon, 11 Jan 2016 19:42:48 +0000 (11:42 -0800)]
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak
Bug:
26338113
Change-Id: I019c4df2c6adbc944122df96968ddd11a02ebe33
Nick Kralevich [Fri, 23 Oct 2015 04:32:47 +0000 (04:32 +0000)]
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
Nick Kralevich [Fri, 23 Oct 2015 04:26:03 +0000 (04:26 +0000)]
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
Nick Kralevich [Fri, 23 Oct 2015 04:19:51 +0000 (04:19 +0000)]
DO NOT MERGE: fix build try #2 am:
778b6f4902
am:
034bc1799c -s ours
* commit '
034bc1799cbbc4184aa507eba181573c0a3b9b35':
DO NOT MERGE: fix build try #2
Nick Kralevich [Fri, 23 Oct 2015 04:15:21 +0000 (04:15 +0000)]
DO NOT MERGE: fix build try #2
am:
778b6f4902
* commit '
778b6f4902ad824d5fc62071caaa837bb47deee5':
DO NOT MERGE: fix build try #2
Nick Kralevich [Fri, 23 Oct 2015 02:02:42 +0000 (02:02 +0000)]
resolve merge conflicts of
834ac204ce to klp-modular-dev. am:
7f1ea80d65 am:
fa632f6ad7
am:
9ec978732f
* commit '
9ec978732f8dd82e7adef3e37097eaca3fbd65f0':
DO NOT MERGE: fix build breakage
Nick Kralevich [Fri, 23 Oct 2015 01:52:34 +0000 (01:52 +0000)]
resolve merge conflicts of
834ac204ce to klp-modular-dev. am:
7f1ea80d65
am:
fa632f6ad7
* commit '
fa632f6ad7be6b1f488dd3d1b825a82456db5097':
DO NOT MERGE: fix build breakage
Nick Kralevich [Fri, 23 Oct 2015 01:44:26 +0000 (01:44 +0000)]
resolve merge conflicts of
834ac204ce to klp-modular-dev.
am:
7f1ea80d65
* commit '
7f1ea80d65996ab687ff56a884da915535cdc176':
DO NOT MERGE: fix build breakage
Nick Kralevich [Fri, 23 Oct 2015 00:26:19 +0000 (17:26 -0700)]
resolve merge conflicts of
834ac204ce to klp-modular-dev.
Bug:
23905002
Change-Id: Ic7262861af91a8fff27692c0f68761cb3ab12aa3
Nick Kralevich [Thu, 22 Oct 2015 21:48:50 +0000 (14:48 -0700)]
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
Nick Kralevich [Thu, 22 Oct 2015 14:09:23 +0000 (07:09 -0700)]
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
Flanker [Thu, 22 Oct 2015 02:15:13 +0000 (02:15 +0000)]
add number constraint for samples per MotionEvent am:
5d17838ade am:
72c8ca4a01 am:
9964d83869
am:
90dc6dc825
* commit '
90dc6dc825ebd1f0f4c9474fad887cd7eac8e9bd':
add number constraint for samples per MotionEvent
Flanker [Thu, 22 Oct 2015 02:10:12 +0000 (02:10 +0000)]
add number constraint for samples per MotionEvent am:
5d17838ade am:
72c8ca4a01
am:
9964d83869
* commit '
9964d83869565cf4dda432129cfe50f6ede19338':
add number constraint for samples per MotionEvent
Flanker [Thu, 22 Oct 2015 02:04:55 +0000 (02:04 +0000)]
add number constraint for samples per MotionEvent am:
5d17838ade
am:
72c8ca4a01
* commit '
72c8ca4a0191827fd3265c0820b685a6cf420be1':
add number constraint for samples per MotionEvent
Flanker [Thu, 22 Oct 2015 02:02:46 +0000 (02:02 +0000)]
add number constraint for samples per MotionEvent
am:
5d17838ade
* commit '
5d17838adef13062717322e79d4db0b9bb6b2395':
add number constraint for samples per MotionEvent
Flanker [Mon, 7 Sep 2015 07:28:58 +0000 (15:28 +0800)]
add number constraint for samples per MotionEvent
Bug:
23905002
Signed-off-by: Adam Lesinski <adamlesinski@google.com>
(cherry picked from commit
552a8a5d8df32f659b8d11311a244cdc6d3b7733)
Change-Id: I9b7ea859889b7697bee4165a2746602212120543
Naveen Leekha [Tue, 20 Oct 2015 16:42:34 +0000 (16:42 +0000)]
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
Naveen Leekha [Thu, 24 Sep 2015 22:55:21 +0000 (15:55 -0700)]
resolved conflicts for
7534e4e6 to lmp-mr1-ub-dev
Change-Id: I543df164076b44578b14d41031800bb62b81586d
Naveen Leekha [Thu, 24 Sep 2015 22:20:05 +0000 (22:20 +0000)]
am
18165848: am
e2c4f4fb: am
c1e6fbb5: Initialize local variables to avoid data leak
* commit '
18165848e86feab8656bfdac3173bccf45a9a6df':
Initialize local variables to avoid data leak
Naveen Leekha [Thu, 24 Sep 2015 22:13:06 +0000 (22:13 +0000)]
am
73887c08: am
b414255f: Initialize local variables to avoid data leak
* commit '
73887c0864c9a928db6f66bd48c5aea4d31d9a8b':
Initialize local variables to avoid data leak
Naveen Leekha [Thu, 24 Sep 2015 22:04:48 +0000 (22:04 +0000)]
am
e2c4f4fb: am
c1e6fbb5: Initialize local variables to avoid data leak
* commit '
e2c4f4fb8b34e36a4f2760f3812c942604cabfb6':
Initialize local variables to avoid data leak
Naveen Leekha [Thu, 24 Sep 2015 22:00:33 +0000 (22:00 +0000)]
am
b414255f: Initialize local variables to avoid data leak
* commit '
b414255f53b560a06e642251535b019327ba0d7b':
Initialize local variables to avoid data leak
Naveen Leekha [Thu, 24 Sep 2015 22:00:13 +0000 (22:00 +0000)]
am
c1e6fbb5: Initialize local variables to avoid data leak
* commit '
c1e6fbb52c3f85cc7610d1d07d12be38f70b4ed4':
Initialize local variables to avoid data leak
Naveen Leekha [Wed, 23 Sep 2015 01:04:44 +0000 (18:04 -0700)]
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
Naveen Leekha [Wed, 23 Sep 2015 00:58:21 +0000 (17:58 -0700)]
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
Christopher Tate [Thu, 2 Jul 2015 02:57:06 +0000 (02:57 +0000)]
am
35851e2a: am
38ff2b44: am
c1d8af50: am
3a9b9aec: am
dc3d6af9: am
bb686c25: Disregard alleged binder entities beyond parcel bounds
* commit '
35851e2abbfe8f1d9c4cc7dc13a6e6e155b61664':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 02:45:16 +0000 (02:45 +0000)]
am
38ff2b44: am
c1d8af50: am
3a9b9aec: am
dc3d6af9: am
bb686c25: Disregard alleged binder entities beyond parcel bounds
* commit '
38ff2b44ad7a64768cd1bb8793ec6c45e8d1e68e':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 02:33:03 +0000 (02:33 +0000)]
am
c1d8af50: am
3a9b9aec: am
dc3d6af9: am
bb686c25: Disregard alleged binder entities beyond parcel bounds
* commit '
c1d8af50c314164c0e6760d364b47d16b8d423ee':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 02:18:21 +0000 (02:18 +0000)]
am
110654ae: am
8e44d0a1: am
0804ed8e: am
1b8a2f82: Disregard alleged binder entities beyond parcel bounds
* commit '
110654ae44e45b1afd5badd24ada96cb9018bed1':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 02:07:24 +0000 (02:07 +0000)]
am
3a9b9aec: am
dc3d6af9: am
bb686c25: Disregard alleged binder entities beyond parcel bounds
* commit '
3a9b9aec7a0c04b74a278be5773fcfdaa2a04f4e':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 02:06:40 +0000 (02:06 +0000)]
am
8e44d0a1: am
0804ed8e: am
1b8a2f82: Disregard alleged binder entities beyond parcel bounds
* commit '
8e44d0a173d1f0ec4075778791c88dc392f3981e':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 01:55:53 +0000 (01:55 +0000)]
am
0804ed8e: am
1b8a2f82: Disregard alleged binder entities beyond parcel bounds
* commit '
0804ed8e604f2c4304fa7be3a84f429f770221bf':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 01:55:43 +0000 (01:55 +0000)]
am
708b42e0: am
eba7afcc: am
2f340be3: Disregard alleged binder entities beyond parcel bounds
* commit '
708b42e0ee5ad97b8426a6245f73131ddfc59a33':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 01:42:09 +0000 (01:42 +0000)]
am
dc3d6af9: am
bb686c25: Disregard alleged binder entities beyond parcel bounds
* commit '
dc3d6af97d521678981c773ad9f4e1da088d7870':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 01:41:09 +0000 (01:41 +0000)]
am
eba7afcc: am
2f340be3: Disregard alleged binder entities beyond parcel bounds
* commit '
eba7afcc14f55e7fd32db9254f2b186108e1c776':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 01:31:09 +0000 (01:31 +0000)]
am
bb686c25: Disregard alleged binder entities beyond parcel bounds
* commit '
bb686c25b214edadd1830abd056db2d570d716ff':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 01:29:18 +0000 (01:29 +0000)]
am
1b8a2f82: Disregard alleged binder entities beyond parcel bounds
* commit '
1b8a2f82fedffbc0b24c884def197db392b16576':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 01:28:56 +0000 (01:28 +0000)]
am
2f340be3: Disregard alleged binder entities beyond parcel bounds
* commit '
2f340be345612d9fc2ecb1ea2a4c9e147610a593':
Disregard alleged binder entities beyond parcel bounds
Anthony Hugh [Thu, 25 Jun 2015 01:27:44 +0000 (01:27 +0000)]
am
9e415d71: DO NOT MERGE: Introduce stem keycodes for Wear
* commit '
9e415d719e4ceb7a3e93c0d60f9c3bf9ee4fc97f':
DO NOT MERGE: Introduce stem keycodes for Wear
Anthony Hugh [Tue, 23 Jun 2015 17:49:05 +0000 (10:49 -0700)]
DO NOT MERGE: Introduce stem keycodes for Wear
Cherry-pick from master
This change adds four new stem keycodes for Android Wear. These
keycodes are intended to represent the various hardware buttons
around the watch. There is one primary stem key that will be used
for power/settings and three generic stem keys that will be
customizable.
BUG:
21903503
Change-Id: I762b8c0bcf3780a1756f4c1b8bbf07a039ba7781
Christopher Tate [Thu, 28 May 2015 00:53:02 +0000 (17:53 -0700)]
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
27182be9f20f4f5b48316666429f09b9ecc1f22e)
Christopher Tate [Thu, 28 May 2015 00:53:02 +0000 (17:53 -0700)]
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
27182be9f20f4f5b48316666429f09b9ecc1f22e)
Christopher Tate [Thu, 28 May 2015 00:53:02 +0000 (17:53 -0700)]
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
27182be9f20f4f5b48316666429f09b9ecc1f22e)
Adam Lesinski [Thu, 28 May 2015 22:30:05 +0000 (22:30 +0000)]
am
8728c390: am
2c4f5fde: am
861c3f56: am
9004e7f5: am
4ff0cb44: Verify that the native handle was created
* commit '
8728c390476110857dd6b290dac3bfdf13b33e81':
Verify that the native handle was created
Adam Lesinski [Thu, 28 May 2015 21:44:36 +0000 (21:44 +0000)]
am
2c4f5fde: am
861c3f56: am
9004e7f5: am
4ff0cb44: Verify that the native handle was created
* commit '
2c4f5fdeca8e7a6f672bbcb8c25e6b81bf4eaa5b':
Verify that the native handle was created
Adam Lesinski [Thu, 28 May 2015 21:11:44 +0000 (21:11 +0000)]
am
861c3f56: am
9004e7f5: am
4ff0cb44: Verify that the native handle was created
* commit '
861c3f56157813627467054f488ecff7d339f2b0':
Verify that the native handle was created
Adam Lesinski [Thu, 28 May 2015 20:40:46 +0000 (20:40 +0000)]
am
9004e7f5: am
4ff0cb44: Verify that the native handle was created
* commit '
9004e7f5516c5b4a1b4178fa6a8bb4b3ca4ddcd0':
Verify that the native handle was created
Adam Lesinski [Thu, 28 May 2015 20:26:02 +0000 (20:26 +0000)]
am
4ff0cb44: Verify that the native handle was created
* commit '
4ff0cb4404db31576cd8a81ca5ef3b044d492904':
Verify that the native handle was created
Adam Lesinski [Wed, 13 May 2015 00:35:48 +0000 (17:35 -0700)]
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
eaac99a7172da52a76ba48c26413778a74951b1a)
Dan Stoza [Fri, 24 Apr 2015 16:12:30 +0000 (16:12 +0000)]
am
ef47c080: am
958f5011: Merge "libgui: Allow an IGBProducer to disable allocation"
* commit '
ef47c080fd0e7fb8bf1fc4b0ecadae277a22f2cf':
libgui: Allow an IGBProducer to disable allocation
Dan Stoza [Fri, 24 Apr 2015 16:12:29 +0000 (16:12 +0000)]
am
f96a7581: am
fb6d43ff: Merge "libgui: Change BufferQueue to use free lists"
* commit '
f96a758139be0d5c298abad8e27083b0f0849818':
libgui: Change BufferQueue to use free lists
Dan Stoza [Fri, 24 Apr 2015 16:00:22 +0000 (16:00 +0000)]
am
958f5011: Merge "libgui: Allow an IGBProducer to disable allocation"
* commit '
958f501189a29e53767f41bc8172e4af8d1ce2bf':
libgui: Allow an IGBProducer to disable allocation
Dan Stoza [Fri, 24 Apr 2015 16:00:21 +0000 (16:00 +0000)]
am
fb6d43ff: Merge "libgui: Change BufferQueue to use free lists"
* commit '
fb6d43ff44bb2b708494749a7f6037505ccd7bf6':
libgui: Change BufferQueue to use free lists
Dan Stoza [Fri, 24 Apr 2015 15:50:09 +0000 (15:50 +0000)]
Merge "libgui: Allow an IGBProducer to disable allocation"
Dan Stoza [Fri, 24 Apr 2015 15:48:37 +0000 (15:48 +0000)]
Merge "libgui: Change BufferQueue to use free lists"
Dan Stoza [Thu, 23 Apr 2015 23:13:56 +0000 (23:13 +0000)]
am
fece8306: am
56f1f16c: Merge "libgui: Fix some bitrot/warnings in tests"
* commit '
fece83060e9640636f00a97fe236aff353d78c71':
libgui: Fix some bitrot/warnings in tests
Dan Stoza [Thu, 23 Apr 2015 23:13:56 +0000 (23:13 +0000)]
am
9aae16a4: am
82e4d49b: Merge "libui/libgui: Fix errors in parceling"
* commit '
9aae16a47d727a2650af0f0892657b41bd88215d':
libui/libgui: Fix errors in parceling
Dan Stoza [Thu, 23 Apr 2015 23:02:49 +0000 (23:02 +0000)]
am
56f1f16c: Merge "libgui: Fix some bitrot/warnings in tests"
* commit '
56f1f16c7b01a53282d483259ae80d035cc6496b':
libgui: Fix some bitrot/warnings in tests
Dan Stoza [Thu, 23 Apr 2015 23:02:48 +0000 (23:02 +0000)]
am
82e4d49b: Merge "libui/libgui: Fix errors in parceling"
* commit '
82e4d49b0ecb205d49f02cc07496f7508c56443c':
libui/libgui: Fix errors in parceling
Dan Stoza [Thu, 23 Apr 2015 22:53:36 +0000 (22:53 +0000)]
Merge "libgui: Fix some bitrot/warnings in tests"
Dan Stoza [Thu, 23 Apr 2015 22:51:00 +0000 (22:51 +0000)]
Merge "libui/libgui: Fix errors in parceling"
Dan Stoza [Fri, 17 Apr 2015 00:28:43 +0000 (17:28 -0700)]
libgui: Allow an IGBProducer to disable allocation
Adds a new method IGBP::allowAllocation, which controls whether
dequeueBuffer is permitted to allocate a new buffer. If allocation is
disallowed, dequeueBuffer will block or return an error as it
normally would (as controlled by *ControlledByApp).
If there are free buffers, but they are not of the correct dimensions,
format, or usage, they may be freed if a more suitable buffer is not
found first.
Bug:
19801715
Change-Id: I0d604958b78b2fd775c2547690301423f9a52165
Dan Stoza [Thu, 23 Apr 2015 20:20:51 +0000 (13:20 -0700)]
libgui: Change BufferQueue to use free lists
BufferQueue used to choose free buffers by scanning through its array
of slots and picking one based on timestamp. This changes that
mechanism to use a pair of free lists: one with buffers attached and
one without. This makes it easier to choose either type of free slot
depending on the needs of the current operation.
Fixes an issue with the first version of this change, found in bugs
20482952,
20443314, and
20464549.
Bug:
13175420
Change-Id: I9b6e83cfe8f9b4329a976025cb8e291d51fb6d4a
Dan Stoza [Thu, 23 Apr 2015 00:17:59 +0000 (00:17 +0000)]
am
368270fd: am
de5c15b8: Merge "SF: Always perform sideband transactions"
* commit '
368270fd6d4681d2de5502ffc6194ade9a13e65a':
SF: Always perform sideband transactions
Dan Stoza [Thu, 23 Apr 2015 00:06:03 +0000 (00:06 +0000)]
am
de5c15b8: Merge "SF: Always perform sideband transactions"
* commit '
de5c15b8bd12143829d043fa4ab457600e5682b3':
SF: Always perform sideband transactions
Dan Stoza [Wed, 22 Apr 2015 23:57:28 +0000 (23:57 +0000)]
Merge "SF: Always perform sideband transactions"
Dan Stoza [Wed, 22 Apr 2015 21:59:08 +0000 (14:59 -0700)]
SF: Always perform sideband transactions
On normal Layers, we defer applying resize transactions until a buffer
of the correct size arrives. This breaks with sideband streams, because
buffers are not seen by SurfaceFlinger. This change applies
transactions immediately for Layers which have a sideband stream
attached to avoid that problem.
Bug:
20428254
Change-Id: I379d8aaef460d467cdf8432764b4a504928fb65a
(cherry picked from commit
c300b8b506536e1bf94ffd8a3b75d46e776923e0)
Dan Stoza [Wed, 22 Apr 2015 19:17:56 +0000 (19:17 +0000)]
am
d2c12e4c: am
7637e35d: Merge "Revert "libgui: Change BufferQueue to use free lists""
* commit '
d2c12e4cd394ab9ed642526f8bd0e1b3acd692ae':
Revert "libgui: Change BufferQueue to use free lists"
Dan Stoza [Wed, 22 Apr 2015 19:07:10 +0000 (19:07 +0000)]
am
7637e35d: Merge "Revert "libgui: Change BufferQueue to use free lists""
* commit '
7637e35d17e06d532b0d2d11c0eef60594726209':
Revert "libgui: Change BufferQueue to use free lists"
Dan Stoza [Wed, 22 Apr 2015 18:59:01 +0000 (18:59 +0000)]
Merge "Revert "libgui: Change BufferQueue to use free lists""
Dan Stoza [Wed, 22 Apr 2015 18:57:39 +0000 (18:57 +0000)]
Revert "libgui: Change BufferQueue to use free lists"
This reverts commit
8dddc990103b71137be2a6365a26b1ac36598e68.
Change-Id: I0b0fed9f1394c6f6ae812f6c562ead4473a8226e
Dan Stoza [Wed, 22 Apr 2015 00:30:31 +0000 (00:30 +0000)]
am
91f16b1b: am
e647ddde: Merge "libgui: Fix CPU rendering on Surface"
* commit '
91f16b1b9c12e897d15198953684d9c7731ca47a':
libgui: Fix CPU rendering on Surface
Dan Stoza [Wed, 22 Apr 2015 00:17:33 +0000 (00:17 +0000)]
am
e647ddde: Merge "libgui: Fix CPU rendering on Surface"
* commit '
e647dddebb11a383c0d95b6dfd0cbe0998d9b644':
libgui: Fix CPU rendering on Surface
Dan Stoza [Wed, 22 Apr 2015 00:07:51 +0000 (00:07 +0000)]
Merge "libgui: Fix CPU rendering on Surface"
Dan Stoza [Tue, 21 Apr 2015 23:42:49 +0000 (16:42 -0700)]
libgui: Fix CPU rendering on Surface
When the surface damage code went in, it incorrectly assumed that if
an application was doing CPU rendering, it would be using lock and
unlockAndPost instead of dequeue and queue, so it repurposed the dirty
region too aggressively. This change keeps it from clobbering the
dirty region if a CPU producer is attached.
Bug:
20431815
Change-Id: Id4dfd71378311ea822f0289f6de2d20a7bd84014
Dan Stoza [Mon, 20 Apr 2015 20:35:50 +0000 (20:35 +0000)]
am
483c76dc: am
ff5c1a6b: Merge "libgui: Change BufferQueue to use free lists"
* commit '
483c76dcb855fe87adc670c0a0ea1e1ce237dd81':
libgui: Change BufferQueue to use free lists
Dan Stoza [Mon, 20 Apr 2015 20:24:58 +0000 (20:24 +0000)]
am
ff5c1a6b: Merge "libgui: Change BufferQueue to use free lists"
* commit '
ff5c1a6b677d8d25630ffc3d1a868eb98a38ceab':
libgui: Change BufferQueue to use free lists
Dan Stoza [Mon, 20 Apr 2015 19:09:38 +0000 (12:09 -0700)]
libgui: Fix some bitrot/warnings in tests
These tests hadn't been run in a while and had accumulated some rot.
This fixes most of the compile warnings and some tests which fail
incorrectly, but 2 failures remain on N6.
Change-Id: I7fee78cd058a32f4d7df40ec9f899ff767f68517
Dan Stoza [Mon, 20 Apr 2015 19:07:13 +0000 (12:07 -0700)]
libui/libgui: Fix errors in parceling
BufferItem and GraphicBuffer were not parceling correctly, which had
not been noticed because the libgui tests (specifically, one that
tests placing a BufferQueue in a separate process from the IGBP/C)
had not been run recently. This change fixes the errors found in
those classes.
Change-Id: Ie224361a534a79115a3481d83ff97f21d154d4f5
Dan Stoza [Mon, 20 Apr 2015 20:14:13 +0000 (20:14 +0000)]
Merge "libgui: Change BufferQueue to use free lists"
Dan Stoza [Thu, 16 Apr 2015 22:39:18 +0000 (15:39 -0700)]
libgui: Change BufferQueue to use free lists
BufferQueue used to choose free buffers by scanning through its array
of slots and picking one based on timestamp. This changes that
mechanism to use a pair of free lists: one with buffers attached and
one without. This makes it easier to choose either type of free slot
depending on the needs of the current operation.
Bug:
13175420
Change-Id: Ic8398e7511bd11a60a1c82e3ad2ee271c9822be1
Dan Stoza [Wed, 15 Apr 2015 21:54:30 +0000 (21:54 +0000)]
am
b47584f4: am
2e398e64: Merge "SF: Permit changing DispSync offsets at runtime"
* commit '
b47584f46bd850723679d9212f66df1951bbdf5d':
SF: Permit changing DispSync offsets at runtime
Dan Stoza [Wed, 15 Apr 2015 21:46:45 +0000 (21:46 +0000)]
am
2e398e64: Merge "SF: Permit changing DispSync offsets at runtime"
* commit '
2e398e64b3bc827ec8caaa1457442a8b3d546aed':
SF: Permit changing DispSync offsets at runtime
Dan Stoza [Wed, 15 Apr 2015 21:37:19 +0000 (21:37 +0000)]
Merge "SF: Permit changing DispSync offsets at runtime"
Dan Stoza [Wed, 15 Apr 2015 20:57:33 +0000 (20:57 +0000)]
am
40b2a8b4: am
e7d20eb0: Merge "SurfaceFlinger: Pass surface damage to HWC"
* commit '
40b2a8b48c8b760699bde3f29e3dbee76015cc98':
SurfaceFlinger: Pass surface damage to HWC
Dan Stoza [Tue, 14 Apr 2015 18:34:01 +0000 (11:34 -0700)]
SF: Permit changing DispSync offsets at runtime
This modifies EventThread such that its phase offsets for both
Choreographer and SurfaceFlinger may be modified at runtime. It also
plumbs this functionality up to the SurfaceFlinger debug interface so
that it is possible to rapidly test different offsets without
restarting the framework.
Change-Id: I426873f8553f931250dfebc9a8a4a78e9f1f4309
Dan Stoza [Wed, 15 Apr 2015 20:46:35 +0000 (20:46 +0000)]
am
e7d20eb0: Merge "SurfaceFlinger: Pass surface damage to HWC"
* commit '
e7d20eb000c1d342c8f5f58011023c0eb7cea6d5':
SurfaceFlinger: Pass surface damage to HWC
Dan Stoza [Wed, 15 Apr 2015 20:45:44 +0000 (20:45 +0000)]
am
57a9f5a0: am
fd5f41be: Merge "libgui: Pass surface damage through BufferQueue"
* commit '
57a9f5a05327de352896612caf85c991e65ca7be':
libgui: Pass surface damage through BufferQueue
Dan Stoza [Wed, 15 Apr 2015 20:35:02 +0000 (20:35 +0000)]
am
fd5f41be: Merge "libgui: Pass surface damage through BufferQueue"
* commit '
fd5f41bee9bcb2df64c39ff0de7d684e43d90d9c':
libgui: Pass surface damage through BufferQueue
Dan Stoza [Wed, 15 Apr 2015 20:34:50 +0000 (20:34 +0000)]
Merge "SurfaceFlinger: Pass surface damage to HWC"
Dan Stoza [Wed, 15 Apr 2015 20:29:45 +0000 (20:29 +0000)]
am
c02377e6: am
4d769d8b: Merge "libui: Clean up Fence and Region flattening"
* commit '
c02377e6fd1e7380816ce5c4902330226f20721a':
libui: Clean up Fence and Region flattening
Dan Stoza [Wed, 15 Apr 2015 20:29:44 +0000 (20:29 +0000)]
am
0b2ac673: am
22412a34: Merge "libEGL: Add wrappers for partial update functions"
* commit '
0b2ac673137128cd781ab304ab1cab20e9335f8e':
libEGL: Add wrappers for partial update functions
Dan Stoza [Wed, 15 Apr 2015 20:26:55 +0000 (20:26 +0000)]
Merge "libgui: Pass surface damage through BufferQueue"
OSDN Git Service
