OSDN Git Service
Nick Vaccaro [Tue, 26 Jan 2016 20:15:15 +0000 (20:15 +0000)]
Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev
am:
ca19b6a4d3 -s ours
* commit '
ca19b6a4d347dae318157988134471f9d40e2052':
[DO NOT MERGE ANYWHERE] Fix bodysensor permission
Nick Vaccaro [Tue, 26 Jan 2016 20:13:29 +0000 (20:13 +0000)]
Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev
Peng Xu [Fri, 22 Jan 2016 07:15:04 +0000 (23:15 -0800)]
[DO NOT MERGE ANYWHERE] Fix bodysensor permission
Bug:
26481493
Bug:
26447970
Change-Id: Iaadf64814c03ae8098c8553ac98d19b77c1eabcd
Robert Shih [Fri, 15 Jan 2016 01:58:27 +0000 (01:58 +0000)]
IGraphicBufferProducer: fix QUEUE_BUFFER info leak am:
d06421fd37 am:
413318311c am:
dc9ec35294 am:
9d959e2755 am:
edb7c81a1b am:
2a7a1247cb am:
40ba03fc68
am:
ea2b6c68e1
* commit '
ea2b6c68e14b918972b1390765fdf4f748b49ba2':
IGraphicBufferProducer: fix QUEUE_BUFFER info leak
Robert Shih [Fri, 15 Jan 2016 01:56:25 +0000 (01:56 +0000)]
IGraphicBufferProducer: fix QUEUE_BUFFER info leak am:
d06421fd37 am:
413318311c am:
dc9ec35294 am:
9d959e2755 am:
edb7c81a1b am:
2a7a1247cb
am:
40ba03fc68
* commit '
40ba03fc68e6c234bb8604784716cb2481ad1c67':
IGraphicBufferProducer: fix QUEUE_BUFFER info leak
Robert Shih [Fri, 15 Jan 2016 01:54:27 +0000 (01:54 +0000)]
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
Robert Shih [Fri, 15 Jan 2016 01:52:25 +0000 (01:52 +0000)]
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak am:
dded8fdbb7 am:
7ee203b59d am:
dc252255af am:
202aaa8f97 am:
ec87aa5218
am:
c5cb7c489b
* commit '
c5cb7c489bcc3a52abdd4d02fb353b0a7b8557eb':
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak
Robert Shih [Fri, 15 Jan 2016 01:52:25 +0000 (01:52 +0000)]
IGraphicBufferProducer: fix QUEUE_BUFFER info leak am:
d06421fd37 am:
413318311c am:
dc9ec35294 am:
9d959e2755
am:
edb7c81a1b
* commit '
edb7c81a1b99d2456910b03db9e4ac250eac2fab':
IGraphicBufferProducer: fix QUEUE_BUFFER info leak
Robert Shih [Fri, 15 Jan 2016 01:50:22 +0000 (01:50 +0000)]
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak am:
dded8fdbb7 am:
7ee203b59d am:
dc252255af am:
202aaa8f97
am:
ec87aa5218
* commit '
ec87aa52189d5d3bbf5df214ab099d5de9f5836c':
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak
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:48:17 +0000 (01:48 +0000)]
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak am:
dded8fdbb7 am:
7ee203b59d am:
dc252255af
am:
202aaa8f97
* commit '
202aaa8f97083b68c0a736f4cd432f61c9b0989d':
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak
Robert Shih [Fri, 15 Jan 2016 01:45:18 +0000 (01:45 +0000)]
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak am:
dded8fdbb7 am:
7ee203b59d
am:
dc252255af
* commit '
dc252255af835bb3a69bc9a0d01da12419c0fc05':
IGraphicBufferConsumer: fix ATTACH_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
Prashant Malani [Wed, 13 Jan 2016 18:44:11 +0000 (18:44 +0000)]
Revert "inputflinger: Initial support for rotary encoders."
am:
d983fd11d4
* commit '
d983fd11d4a00b03f92d09f32c08840e66d90777':
Revert "inputflinger: Initial support for rotary encoders."
Prashant Malani [Wed, 13 Jan 2016 18:44:02 +0000 (18:44 +0000)]
Revert "inputflinger: Add support for scaling and true value reporting"
am:
2c09b78656
* commit '
2c09b78656dd97727f94fada81845b133cf142f3':
Revert "inputflinger: Add support for scaling and true value reporting"
Prashant Malani [Wed, 13 Jan 2016 09:00:25 +0000 (01:00 -0800)]
Revert "inputflinger: Initial support for rotary encoders."
This reverts commit
ac72bbf4e46d6689070df09a25db2960a9036eb2.
Prashant Malani [Wed, 13 Jan 2016 09:00:08 +0000 (01:00 -0800)]
Revert "inputflinger: Add support for scaling and true value reporting"
This reverts commit
ee03865fe5fc6ffe9deda0e0870a18206027cfaf.
Prashant Malani [Wed, 13 Jan 2016 05:33:57 +0000 (05:33 +0000)]
inputflinger: Add support for scaling and true value reporting
am:
ee03865fe5
* commit '
ee03865fe5fc6ffe9deda0e0870a18206027cfaf':
inputflinger: Add support for scaling and true value reporting
Prashant Malani [Tue, 12 Jan 2016 01:08:18 +0000 (17:08 -0800)]
inputflinger: Add support for scaling and true value reporting
-1/+1 somewhat simplifies the values that can be generated by rotary
encoders, and rules out the possibility of batching and more nuanced
movement reporting.
So, we modify the device configuration to allow values other than -1 and
1 to be supported. In order to give the developer a sense of what these
values map to in terms of angular displacement, we also parse a
resolution configuration from the devices IDC file.
This will be specified as:
device.res = xxxx
of type float. If a value is not provided, a default res value of 0.0f
is used.
This patch also adds a per device scaling factor, which is used to
suitably modify the values reported (as well as the resolution) to tune
the input events generated and resulting UI according to the hardware.
This can be specified in the IDC file as:
device.scalingFactor = xxxx
of type float. If a scaling factor is not provided, a default of 1.0f
is used.
Bug:
22836852
Bug:
18707397
Change-Id: I13686f64de1b52d3f6c97b2587ae41e52d1db6e2
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
Mark Salyzyn [Fri, 18 Dec 2015 18:14:46 +0000 (10:14 -0800)]
dumpstate: increase logcat timeout to 40 seconds (DO NOT MERGE)
- temporary measure until root issues can be resolved.
Bug:
23685592
Change-Id: Ia33f4e3928a457c3dcd730ad2c2c57d13fbf133d
Prashant Malani [Tue, 8 Dec 2015 01:30:53 +0000 (01:30 +0000)]
Merge "inputflinger: Initial support for rotary encoders." into cw-e-dev
am:
68fca5a176
* commit '
68fca5a1763203164a19a9aa983895242a671387':
inputflinger: Initial support for rotary encoders.
Prashant Malani [Tue, 8 Dec 2015 01:27:17 +0000 (01:27 +0000)]
Merge "inputflinger: Initial support for rotary encoders." into cw-e-dev
Martijn Coenen [Fri, 4 Dec 2015 09:31:34 +0000 (09:31 +0000)]
Merge "DO NOT MERGE: add support for new sched tracepoint" into mnc-dr1.5-dev
Ben Fennema [Wed, 2 Dec 2015 01:11:29 +0000 (01:11 +0000)]
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"
am:
8c3e55f414 -s ours
* commit '
8c3e55f4149deda3ec7c7a67fda81216d5f9af25':
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"
Ben Fennema [Wed, 2 Dec 2015 01:04:40 +0000 (01:04 +0000)]
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"
This reverts commit
d4db70a7b8b2d136c46c50f89b276f8150be5fc2.
Change-Id: Ifb52d5595970a5178e12c2a90da4aac0e38f5942
Jani Suonpera [Wed, 2 Dec 2015 00:25:47 +0000 (00:25 +0000)]
DO NOT MERGE ANYWHERE Add new interface for sensor physical data
am:
d4db70a7b8 -s ours
* commit '
d4db70a7b8b2d136c46c50f89b276f8150be5fc2':
DO NOT MERGE ANYWHERE Add new interface for sensor physical data
Jani Suonpera [Fri, 9 Oct 2015 08:45:57 +0000 (11:45 +0300)]
DO NOT MERGE ANYWHERE Add new interface for sensor physical data
This is special solution only for emerald branch.
Changes including new const char* value/interface for sensor physical data. Sensor service and manager does not take care of content, structure or other
details of string. Sensor HAL is taking care of parsing data from string and setting values to Sensor HW.
Change-Id: I3abc3ddc7c6adc4b32a40b9a43f2a94c5af7b2b0
Signed-off-by: Ben Fennema <fennema@google.com>
Sharvil Nanavati [Mon, 30 Nov 2015 21:07:46 +0000 (21:07 +0000)]
Increase raft timeout to 10min so we get complete logs from older devices.
am:
804339a59e
* commit '
804339a59e4abcbcf5a50a60ff0543e6b404e572':
Increase raft timeout to 10min so we get complete logs from older devices.
Tim Murray [Mon, 30 Nov 2015 18:59:55 +0000 (10:59 -0800)]
DO NOT MERGE: add support for new sched tracepoint
This tracepoint gives systrace the means to display the reason
for uninterruptible sleep.
bug
23350688
Change-Id: I9ee5b6904c27bcb5bd67c86fda66d45d0a3c0999
Sharvil Nanavati [Sat, 28 Nov 2015 05:04:11 +0000 (21:04 -0800)]
Increase raft timeout to 10min so we get complete logs from older devices.
Devices like dory get slammed when bugreports are taken and can't
compress all the raft logs in the current 5min timeout. Our dogfooders
spend their precious time getting us bugreports and then we can't act
on them because we have broken raft logs. :(
This change bumps up the timeout in the hopes that we can get complete
logs from even our slowest devices.
Change-Id: I10741a6185b39544f4c0531f0ee74864d74a1aa4
Tim Murray [Tue, 10 Nov 2015 22:29:45 +0000 (14:29 -0800)]
Set cpuset from surfaceflinger.
SurfaceFlinger shouldn't be limited to little cores exclusively, as the
binder threads should be placed on big cores when they are in the
critical path for a RenderThread.
bug
25745866
Change-Id: I9fb65f6d951733f91b4735ff27018411b58b2bfb
Lajos Molnar [Fri, 13 Nov 2015 00:16:41 +0000 (00:16 +0000)]
Merge "OMX: clarify EOS signaling for tunneled decoders" into mnc-dev am:
f1de4547c1 am:
37b8c1f77c
am:
8abb053a2e
* commit '
8abb053a2ea021c649e481813e45860add946e36':
OMX: clarify EOS signaling for tunneled decoders
Lajos Molnar [Fri, 13 Nov 2015 00:11:57 +0000 (00:11 +0000)]
Merge "OMX: clarify EOS signaling for tunneled decoders" into mnc-dev am:
f1de4547c1
am:
37b8c1f77c
* commit '
37b8c1f77cab3ee9809bcbad81d765ec5bddedce':
OMX: clarify EOS signaling for tunneled decoders
Lajos Molnar [Fri, 13 Nov 2015 00:07:04 +0000 (00:07 +0000)]
Merge "OMX: clarify EOS signaling for tunneled decoders" into mnc-dev
am:
f1de4547c1
* commit '
f1de4547c14467c03b00187efde5381dd1fb265c':
OMX: clarify EOS signaling for tunneled decoders
Lajos Molnar [Fri, 13 Nov 2015 00:00:19 +0000 (00:00 +0000)]
Merge "OMX: clarify EOS signaling for tunneled decoders" into mnc-dev
Peng Xu [Thu, 29 Oct 2015 16:46:18 +0000 (16:46 +0000)]
Merge "Avoiding flush on-change sensors at subscription" into mnc-dr-dev am:
a78c2e65e1
am:
ffb07f645e
* commit '
ffb07f645e12b5c32479bba74b3310353edf691a':
Avoiding flush on-change sensors at subscription
Peng Xu [Tue, 27 Oct 2015 22:31:50 +0000 (22:31 +0000)]
Merge "Avoiding flush on-change sensors at subscription" into mnc-dr-dev
am:
a78c2e65e1
* commit '
a78c2e65e13cace4fdbb0295beca5b11de9fde06':
Avoiding flush on-change sensors at subscription
Peng Xu [Tue, 27 Oct 2015 22:23:21 +0000 (22:23 +0000)]
Merge "Avoiding flush on-change sensors at subscription" into mnc-dr-dev
Peng Xu [Mon, 26 Oct 2015 22:14:43 +0000 (15:14 -0700)]
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
Nick Kralevich [Fri, 23 Oct 2015 21:40:03 +0000 (21:40 +0000)]
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 am:
574145ea31
am:
5ce90247a2
* commit '
5ce90247a20536091505b449a4d386c21034d842':
DO NOT MERGE: fix build try #2
Nick Kralevich [Fri, 23 Oct 2015 21:35:13 +0000 (21:35 +0000)]
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
am:
574145ea31
* commit '
574145ea31171a80c45f86eb231f55a2106826c4':
DO NOT MERGE: fix build try #2
Nick Kralevich [Fri, 23 Oct 2015 21:22:14 +0000 (21:22 +0000)]
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
Adrian Roos [Fri, 23 Oct 2015 17:32:40 +0000 (17:32 +0000)]
Merge changes from topic \'parcel-v2\' into mnc-dr-dev am:
cf33d50d25
am:
0c11f9918c
* commit '
0c11f9918c6f834f12d97315ef0247c08f8fef63':
Maintain Parcel ABI
Revert "Revert "Track ashmem memory usage in Parcel""
Adrian Roos [Fri, 23 Oct 2015 17:28:42 +0000 (17:28 +0000)]
Merge changes from topic \'parcel-v2\' into mnc-dr-dev
am:
cf33d50d25
* commit '
cf33d50d25c5660bf1d4325c11433fb281bc31cb':
Maintain Parcel ABI
Revert "Revert "Track ashmem memory usage in Parcel""
Adrian Roos [Fri, 23 Oct 2015 17:21:23 +0000 (17:21 +0000)]
Merge changes from topic 'parcel-v2' into mnc-dr-dev
* changes:
Maintain Parcel ABI
Revert "Revert "Track ashmem memory usage in Parcel""
Nick Kralevich [Fri, 23 Oct 2015 04:36:16 +0000 (04:36 +0000)]
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
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:07 +0000 (04:26 +0000)]
resolve merge conflicts of
834ac204ce to klp-modular-dev. am:
7f1ea80d65 am:
fa632f6ad7 am:
9ec978732f am:
1b28b05d2e am:
0370a03b6e am:
18e7c64ea8
am:
6eac97d4ba
* commit '
6eac97d4baf77954c7d862e7bf35ed3763543491':
DO NOT MERGE: fix build breakage
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
Flanker [Fri, 23 Oct 2015 04:26:03 +0000 (04:26 +0000)]
add number constraint for samples per MotionEvent am:
5d17838ade am:
72c8ca4a01 am:
9964d83869 am:
90dc6dc825 am:
9830f11dc6 am:
a82ace99f7 am:
711c7becb0
am:
928a4879e4
* commit '
928a4879e4a2b996bccf007d390f7f2719e9a901':
add number constraint for samples per MotionEvent
Nick Kralevich [Fri, 23 Oct 2015 04:23:35 +0000 (04:23 +0000)]
resolve merge conflicts of
834ac204ce to klp-modular-dev. am:
7f1ea80d65 am:
fa632f6ad7 am:
9ec978732f am:
1b28b05d2e am:
0370a03b6e
am:
18e7c64ea8
* commit '
18e7c64ea82e002978ef069884d195e02e7302df':
DO NOT MERGE: fix build breakage
Flanker [Fri, 23 Oct 2015 04:23:24 +0000 (04:23 +0000)]
add number constraint for samples per MotionEvent am:
5d17838ade am:
72c8ca4a01 am:
9964d83869 am:
90dc6dc825 am:
9830f11dc6 am:
a82ace99f7
am:
711c7becb0
* commit '
711c7becb01eec79d8335f335fab6e00a9164b00':
add number constraint for samples per MotionEvent
Nick Kralevich [Fri, 23 Oct 2015 04:19:58 +0000 (04:19 +0000)]
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
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
Flanker [Fri, 23 Oct 2015 04:19:51 +0000 (04:19 +0000)]
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
Nick Kralevich [Fri, 23 Oct 2015 04:15:24 +0000 (04:15 +0000)]
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
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
Adrian Roos [Thu, 22 Oct 2015 23:46:12 +0000 (16:46 -0700)]
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
Adrian Roos [Thu, 22 Oct 2015 23:12:53 +0000 (16:12 -0700)]
Revert "Revert "Track ashmem memory usage in Parcel""
This reverts commit
6880307e8e35a6c484942443fb4ddd6173126152.
Bug:
25004154
Change-Id: I9b432d1ebc39f3bbcd7afdefc403f0fb6ced8158
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
Ian Pedowitz [Thu, 22 Oct 2015 22:33:58 +0000 (22:33 +0000)]
Revert "Track ashmem memory usage in Parcel" am:
6880307e8e
am:
159a5c3372
* commit '
159a5c337250613c166ae45b2811861f70c733bd':
Revert "Track ashmem memory usage in Parcel"
Ian Pedowitz [Thu, 22 Oct 2015 22:32:07 +0000 (22:32 +0000)]
Revert "Track ashmem memory usage in Parcel"
am:
6880307e8e
* commit '
6880307e8e35a6c484942443fb4ddd6173126152':
Revert "Track ashmem memory usage in Parcel"
Flanker [Thu, 22 Oct 2015 22:28:01 +0000 (22:28 +0000)]
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
Ian Pedowitz [Thu, 22 Oct 2015 22:08:10 +0000 (22:08 +0000)]
Revert "Track ashmem memory usage in Parcel"
This reverts commit
e2f499fb734bc30a1e1c947112caa0727349b6ed.
Bug:
25169267
Bug:
25191602
Bug:
25004154
Change-Id: I24bb0da4e8739ee5a0c251e4adac9904827144e0
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
Adrian Roos [Thu, 22 Oct 2015 00:52:32 +0000 (00:52 +0000)]
Track ashmem memory usage in Parcel am:
e2f499fb73
am:
a0c1be2617
* commit '
a0c1be26177d554ef9c5d61b8a564bb03d402a04':
Track ashmem memory usage in Parcel
Adrian Roos [Thu, 22 Oct 2015 00:49:15 +0000 (00:49 +0000)]
Track ashmem memory usage in Parcel
am:
e2f499fb73
* commit '
e2f499fb734bc30a1e1c947112caa0727349b6ed':
Track ashmem memory usage in Parcel
Adrian Roos [Wed, 21 Oct 2015 02:11:23 +0000 (19:11 -0700)]
Track ashmem memory usage in Parcel
Bug:
25004154
Change-Id: Id9d5656dd0605f1b50525596b75601309f67ebdc
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 17:48:10 +0000 (17:48 +0000)]
am
18165848: am
e2c4f4fb: am
c1e6fbb5: Initialize local variables to avoid data leak am:
7534e4e63a -s ours am:
7b4863f606 am:
8121177b5e am:
7135d2768b
am:
5957172a7e
* commit '
5957172a7edb83d05423d5abae0091628f0c557c':
Initialize local variables to avoid data leak
Naveen Leekha [Tue, 20 Oct 2015 17:25:55 +0000 (17:25 +0000)]
am
18165848: am
e2c4f4fb: am
c1e6fbb5: Initialize local variables to avoid data leak am:
7534e4e63a -s ours am:
7b4863f606 am:
8121177b5e
am:
7135d2768b
* commit '
7135d2768bcb46603735ab9b6b4bbaa788d39179':
Initialize local variables to avoid data leak
Naveen Leekha [Tue, 20 Oct 2015 17:02:33 +0000 (17:02 +0000)]
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
Naveen Leekha [Tue, 20 Oct 2015 16:54:09 +0000 (16:54 +0000)]
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
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
Aravind Akella [Wed, 14 Oct 2015 21:13:41 +0000 (21:13 +0000)]
am
6427e719: am
2ac7405b: Merge "Set DATA_INJECTION mode flag for sensors." into mnc-dr-dev
* commit '
6427e7190bbd83a29169e6ae4b5e3cff263f6937':
Set DATA_INJECTION mode flag for sensors.
Aravind Akella [Wed, 14 Oct 2015 21:08:15 +0000 (21:08 +0000)]
am
2ac7405b: Merge "Set DATA_INJECTION mode flag for sensors." into mnc-dr-dev
* commit '
2ac7405bda4f621f07cbcc0b562d16f7a9611c7b':
Set DATA_INJECTION mode flag for sensors.
Aravind Akella [Wed, 14 Oct 2015 21:03:07 +0000 (21:03 +0000)]
Merge "Set DATA_INJECTION mode flag for sensors." into mnc-dr-dev
Jesse Hall [Wed, 14 Oct 2015 20:26:57 +0000 (20:26 +0000)]
am
a518d5ad: am
312d7555: egl: Remove window disconnect before calling driver eglDestroySurface
* commit '
a518d5ad0c0c6a661471a8cd2c962612943ca667':
egl: Remove window disconnect before calling driver eglDestroySurface
Jesse Hall [Wed, 14 Oct 2015 20:14:55 +0000 (20:14 +0000)]
am
312d7555: egl: Remove window disconnect before calling driver eglDestroySurface
* commit '
312d7555cb71ce7fb73bc758b9e30653e223b2f3':
egl: Remove window disconnect before calling driver eglDestroySurface
Jesse Hall [Wed, 14 Oct 2015 18:10:24 +0000 (11:10 -0700)]
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
Adam Lesinski [Mon, 12 Oct 2015 22:30:10 +0000 (22:30 +0000)]
am
76fc5f18: am
16b0ae10: Merge "add number constraint for samples per MotionEvent" into mnc-dr-dev
* commit '
76fc5f18e6a0271a1f04db54924653faac73912e':
add number constraint for samples per MotionEvent
Adam Lesinski [Mon, 12 Oct 2015 22:23:05 +0000 (22:23 +0000)]
am
16b0ae10: Merge "add number constraint for samples per MotionEvent" into mnc-dr-dev
* commit '
16b0ae105e4e94ff09d1517b68f7c66f2022a19e':
add number constraint for samples per MotionEvent
Adam Lesinski [Mon, 12 Oct 2015 22:15:50 +0000 (22:15 +0000)]
Merge "add number constraint for samples per MotionEvent" into mnc-dr-dev
Flanker [Mon, 7 Sep 2015 07:28:58 +0000 (15:28 +0800)]
add number constraint for samples per MotionEvent
Bug:
23905002
Change-Id: Ifd24802977c3dcdd1dbc5120a78aac41beae4603
Signed-off-by: Adam Lesinski <adamlesinski@google.com>
Jason Parks [Mon, 12 Oct 2015 15:39:58 +0000 (15:39 +0000)]
am
33c3c1bd: Merge "Revert "do not dumpstate raft BUG:
24159112"" into cw-e-dev
* commit '
33c3c1bd71de8a903b6a07f0b1c4f2f670313778':
Revert "do not dumpstate raft BUG:
24159112"
Jason Parks [Mon, 12 Oct 2015 15:34:47 +0000 (15:34 +0000)]
Merge "Revert "do not dumpstate raft BUG:
24159112"" into cw-e-dev
OSDN Git Service
