The Android Automerger
ad2ddfd372
merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev
2016-03-22 15:47:49 -07:00
The Android Automerger
4f5381849b
merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev
2016-03-17 18:36:43 -07:00
Pablo Ceballos
a93a310187
Add SN logging
...
Bug 27046057
Change-Id: Iede7c92e59e60795df1ec7768ebafd6b090f1c27
2016-03-01 15:26:40 -08:00
Christopher Tate
a5d2913b07
Sanity check IMemory access versus underlying mmap
...
Bug 26877992
Change-Id: Ibbf4b1061e4675e4e96bc944a865b53eaf6984fe
2016-03-01 15:26:40 -08:00
Pablo Ceballos
28a83d4206
BQ: Add permission check to BufferQueueConsumer::dump
...
Bug 27046057
Change-Id: Id7bd8cf95045b497943ea39dde49e877aa6f5c4e
2016-03-01 15:26:40 -08:00
Robert Shih
6df23e81f7
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
2016-01-15 01:58:27 +00:00
Robert Shih
ea2b6c68e1
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
2016-01-15 01:56:25 +00:00
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
e8cceaf02f
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
2016-01-15 01:52:25 +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
c5cb7c489b
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak am: dded8fdbb7
am: 7ee203b59d
am: dc252255af
am: 202aaa8f97
...
am: ec87aa5218
* commit 'ec87aa52189d5d3bbf5df214ab099d5de9f5836c':
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak
2016-01-15 01:50:22 +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
Prashant Malani
b5458e3baf
Revert "inputflinger: Initial support for rotary encoders."
...
am: d983fd11d4
* commit 'd983fd11d4a00b03f92d09f32c08840e66d90777':
Revert "inputflinger: Initial support for rotary encoders."
2016-01-13 18:44:11 +00:00
Prashant Malani
cd7ddc7cac
Revert "inputflinger: Add support for scaling and true value reporting"
...
am: 2c09b78656
* commit '2c09b78656dd97727f94fada81845b133cf142f3':
Revert "inputflinger: Add support for scaling and true value reporting"
2016-01-13 18:44:02 +00:00
Prashant Malani
d983fd11d4
Revert "inputflinger: Initial support for rotary encoders."
...
This reverts commit ac72bbf4e4
.
2016-01-13 01:00:25 -08:00
Prashant Malani
2c09b78656
Revert "inputflinger: Add support for scaling and true value reporting"
...
This reverts commit ee03865fe5
.
2016-01-13 01:00:08 -08:00
Prashant Malani
a777e8b70f
inputflinger: Add support for scaling and true value reporting
...
am: ee03865fe5
* commit 'ee03865fe5fc6ffe9deda0e0870a18206027cfaf':
inputflinger: Add support for scaling and true value reporting
2016-01-13 05:33:57 +00:00
Prashant Malani
ee03865fe5
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
2016-01-11 17:37:38 -08: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
Mark Salyzyn
03d61d95fa
dumpstate: increase logcat timeout to 40 seconds (DO NOT MERGE)
...
- temporary measure until root issues can be resolved.
Bug: 23685592
Change-Id: Ia33f4e3928a457c3dcd730ad2c2c57d13fbf133d
2015-12-18 10:18:58 -08:00
Prashant Malani
e50ab08fd6
Merge "inputflinger: Initial support for rotary encoders." into cw-e-dev
...
am: 68fca5a176
* commit '68fca5a1763203164a19a9aa983895242a671387':
inputflinger: Initial support for rotary encoders.
2015-12-08 01:30:53 +00:00
Prashant Malani
68fca5a176
Merge "inputflinger: Initial support for rotary encoders." into cw-e-dev
2015-12-08 01:27:17 +00:00
Martijn Coenen
e902acb2ec
Merge "DO NOT MERGE: add support for new sched tracepoint" into mnc-dr1.5-dev
2015-12-04 09:31:34 +00:00
Ben Fennema
da3af0896f
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"
2015-12-02 01:11:29 +00:00
Ben Fennema
8c3e55f414
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"
...
This reverts commit d4db70a7b8
.
Change-Id: Ifb52d5595970a5178e12c2a90da4aac0e38f5942
2015-12-02 01:04:40 +00:00
Jani Suonpera
37f1300ffc
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
2015-12-02 00:25:47 +00:00
Jani Suonpera
d4db70a7b8
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>
2015-11-30 21:27:27 -08:00
Sharvil Nanavati
7126caa17f
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.
2015-11-30 21:07:46 +00:00
Tim Murray
bd65161021
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
2015-11-30 10:59:55 -08:00
Sharvil Nanavati
804339a59e
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
2015-11-27 21:04:11 -08:00
Tim Murray
392db573b3
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
2015-11-18 19:58:04 +00:00
Lajos Molnar
bc9bc0e0fc
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
2015-11-13 00:16:41 +00:00
Lajos Molnar
8abb053a2e
Merge "OMX: clarify EOS signaling for tunneled decoders" into mnc-dev am: f1de4547c1
...
am: 37b8c1f77c
* commit '37b8c1f77cab3ee9809bcbad81d765ec5bddedce':
OMX: clarify EOS signaling for tunneled decoders
2015-11-13 00:11:57 +00: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
e4db21f4b8
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
2015-10-29 16:46:18 +00:00
Peng Xu
ffb07f645e
Merge "Avoiding flush on-change sensors at subscription" into mnc-dr-dev
...
am: a78c2e65e1
* commit 'a78c2e65e13cace4fdbb0295beca5b11de9fde06':
Avoiding flush on-change sensors at subscription
2015-10-27 22:31:50 +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
fd84a642ff
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
2015-10-23 21:40:03 +00:00
Nick Kralevich
5ce90247a2
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
2015-10-23 21:35:13 +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