OSDN Git Service
Nick Vaccaro [Tue, 1 Mar 2016 23:49:08 +0000 (15:49 -0800)]
Return 16 values when sending on-change sensor's last event
Sensor Services now sends 16 values when sending out the last
event for a vendor defined on-change sensor type.
Bug:
26962513
Change-Id: I238b945c9dc9186b621544aef7d0244f63d4b2e8
Pablo Ceballos [Tue, 23 Feb 2016 01:31:05 +0000 (01:31 +0000)]
DO NOT MERGE Add SN logging am:
24cd2b9627 am:
ec7538a254 -s ours am:
aaeceb2379 -s ours am:
828f6f1489 am:
ccc5d9a0f7 -s ours am:
62649e9134
am:
a3def43d3c
* commit '
a3def43d3c98a17468c7cdb33777372746f07b5d':
DO NOT MERGE Add SN logging
Pablo Ceballos [Tue, 23 Feb 2016 01:22:55 +0000 (01:22 +0000)]
DO NOT MERGE Add SN logging am:
24cd2b9627 am:
ec7538a254 -s ours am:
aaeceb2379 -s ours am:
828f6f1489 am:
ccc5d9a0f7 -s ours
am:
62649e9134
* commit '
62649e91348ea1a2988b04ad4d6a4bff880c5fec':
DO NOT MERGE Add SN logging
Pablo Ceballos [Tue, 23 Feb 2016 01:14:45 +0000 (01:14 +0000)]
DO NOT MERGE Add SN logging am:
24cd2b9627 am:
ec7538a254 -s ours am:
aaeceb2379 -s ours am:
828f6f1489
am:
ccc5d9a0f7 -s ours
* commit '
ccc5d9a0f7c2d7e59c9374775ff0d12378d402c6':
DO NOT MERGE Add SN logging
Pablo Ceballos [Tue, 23 Feb 2016 01:08:48 +0000 (01:08 +0000)]
Pablo Ceballos [Tue, 23 Feb 2016 01:08:33 +0000 (01:08 +0000)]
DO NOT MERGE Add SN logging am:
24cd2b9627 am:
ec7538a254 -s ours am:
aaeceb2379 -s ours
am:
828f6f1489
* commit '
828f6f1489f546da0ebccd929dd3b819f9d45efd':
DO NOT MERGE Add SN logging
Pablo Ceballos [Tue, 23 Feb 2016 01:01:52 +0000 (01:01 +0000)]
Pablo Ceballos [Tue, 23 Feb 2016 00:54:18 +0000 (00:54 +0000)]
Pablo Ceballos [Tue, 23 Feb 2016 00:54:18 +0000 (00:54 +0000)]
DO NOT MERGE Add SN logging am:
24cd2b9627 am:
ec7538a254 -s ours
am:
aaeceb2379 -s ours
* commit '
aaeceb2379957791f7a78b441c23c55535a7ba43':
DO NOT MERGE Add SN logging
Pablo Ceballos [Tue, 23 Feb 2016 00:47:33 +0000 (00:47 +0000)]
Pablo Ceballos [Tue, 23 Feb 2016 00:40:58 +0000 (00:40 +0000)]
DO NOT MERGE Add SN logging am:
24cd2b9627
am:
ec7538a254 -s ours
* commit '
ec7538a254f283afc7b046aa8ca2fe908d4e3b0c':
DO NOT MERGE Add SN logging
Pablo Ceballos [Tue, 23 Feb 2016 00:34:17 +0000 (00:34 +0000)]
Pablo Ceballos [Tue, 23 Feb 2016 00:34:17 +0000 (00:34 +0000)]
DO NOT MERGE Add SN logging
am:
24cd2b9627
* commit '
24cd2b96279ac29b936ba09ed708b1bcb922d04c':
DO NOT MERGE Add SN logging
Pablo Ceballos [Sat, 20 Feb 2016 19:30:43 +0000 (11:30 -0800)]
DO NOT MERGE Add SN logging
Bug
27046057
Change-Id: I942876c09fdbe841c19807e463f5426287e07803
Pablo Ceballos [Sat, 20 Feb 2016 19:26:13 +0000 (11:26 -0800)]
Add SN logging
Bug
27046057
Change-Id: Iede7c92e59e60795df1ec7768ebafd6b090f1c27
Pablo Ceballos [Sat, 20 Feb 2016 00:40:22 +0000 (00:40 +0000)]
Merge "DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump" into klp-dev am:
c232606413 am:
1d0e811e5a -s ours am:
8b6dea4fa8 -s ours am:
84cd1a325d am:
31b8553cee -s ours am:
5fe5b47563
am:
c6e289a359
* commit '
c6e289a359df83b122933688a296a4dde37cb674':
DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump
Pablo Ceballos [Sat, 20 Feb 2016 00:34:00 +0000 (00:34 +0000)]
Merge "DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump" into klp-dev am:
c232606413 am:
1d0e811e5a -s ours am:
8b6dea4fa8 -s ours am:
84cd1a325d am:
31b8553cee -s ours
am:
5fe5b47563
* commit '
5fe5b4756383ac1fc858ed00970589a00fb7fe85':
DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump
Pablo Ceballos [Sat, 20 Feb 2016 00:28:10 +0000 (00:28 +0000)]
Merge "DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump" into klp-dev am:
c232606413 am:
1d0e811e5a -s ours am:
8b6dea4fa8 -s ours am:
84cd1a325d
am:
31b8553cee -s ours
* commit '
31b8553ceece9a4e3130510b484163e10c4fc588':
DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump
Pablo Ceballos [Sat, 20 Feb 2016 00:23:04 +0000 (00:23 +0000)]
Merge "BQ: Add permission check to BufferQueueConsumer::dump" into lmp-dev am:
793be16dd3 am:
7e83de0114 am:
f419ec1bfb am:
8b640e6403
am:
5d2c73e7dc
* commit '
5d2c73e7dc9d4d23a76ca92c0170233e897fe55c':
BQ: Add permission check to BufferQueueConsumer::dump
Pablo Ceballos [Sat, 20 Feb 2016 00:22:58 +0000 (00:22 +0000)]
Merge "DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump" into klp-dev am:
c232606413 am:
1d0e811e5a -s ours am:
8b6dea4fa8 -s ours
am:
84cd1a325d
* commit '
84cd1a325d4e1ff1bdec09137b13a7c925b267f8':
DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump
Pablo Ceballos [Sat, 20 Feb 2016 00:17:09 +0000 (00:17 +0000)]
Merge "BQ: Add permission check to BufferQueueConsumer::dump" into lmp-dev am:
793be16dd3 am:
7e83de0114 am:
f419ec1bfb
am:
8b640e6403
* commit '
8b640e6403de9dd328b2605c9f21b62d1d31e7d6':
BQ: Add permission check to BufferQueueConsumer::dump
Pablo Ceballos [Sat, 20 Feb 2016 00:11:58 +0000 (00:11 +0000)]
Merge "DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump" into klp-dev am:
c232606413 am:
1d0e811e5a -s ours
am:
8b6dea4fa8 -s ours
* commit '
8b6dea4fa88e967c221821e03f88b8f42585869e':
DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump
Pablo Ceballos [Sat, 20 Feb 2016 00:11:58 +0000 (00:11 +0000)]
Merge "BQ: Add permission check to BufferQueueConsumer::dump" into lmp-dev am:
793be16dd3 am:
7e83de0114
am:
f419ec1bfb
* commit '
f419ec1bfb969f1add4c90b5b188041968f5f227':
BQ: Add permission check to BufferQueueConsumer::dump
Pablo Ceballos [Sat, 20 Feb 2016 00:06:10 +0000 (00:06 +0000)]
Merge "BQ: Add permission check to BufferQueueConsumer::dump" into lmp-dev am:
793be16dd3
am:
7e83de0114
* commit '
7e83de0114538b006b4299fd608983ecd61b6422':
BQ: Add permission check to BufferQueueConsumer::dump
Pablo Ceballos [Sat, 20 Feb 2016 00:00:50 +0000 (00:00 +0000)]
Merge "DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump" into klp-dev am:
c232606413
am:
1d0e811e5a -s ours
* commit '
1d0e811e5ac853669fe96370e499428049a5b7ee':
DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump
Pablo Ceballos [Fri, 19 Feb 2016 23:54:34 +0000 (23:54 +0000)]
Merge "DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump" into klp-dev
am:
c232606413
* commit '
c2326064136adb834d12c3fed47af5d66cd42c15':
DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump
Pablo Ceballos [Fri, 19 Feb 2016 23:54:33 +0000 (23:54 +0000)]
Merge "BQ: Add permission check to BufferQueueConsumer::dump" into lmp-dev
am:
793be16dd3
* commit '
793be16dd31661e0e95915caa6fc99afc4acc3f6':
BQ: Add permission check to BufferQueueConsumer::dump
Pablo Ceballos [Fri, 19 Feb 2016 23:39:53 +0000 (23:39 +0000)]
Merge "BQ: Add permission check to BufferQueueConsumer::dump" into lmp-dev
Pablo Ceballos [Fri, 19 Feb 2016 23:39:36 +0000 (23:39 +0000)]
Merge "DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump" into klp-dev
Christopher Tate [Wed, 17 Feb 2016 19:29:18 +0000 (19:29 +0000)]
Sanity check IMemory access versus underlying mmap am:
94b0d4e3ab am:
ef6908e2b3 am:
97f49e50de am:
84f488f354 am:
ebdad60d6b am:
fc598c54d9
am:
f9e5e80bc1
* commit '
f9e5e80bc1fe9255fa65b7185514d86beee5952a':
Sanity check IMemory access versus underlying mmap
Christopher Tate [Wed, 17 Feb 2016 19:23:03 +0000 (19:23 +0000)]
Sanity check IMemory access versus underlying mmap am:
94b0d4e3ab am:
ef6908e2b3 am:
97f49e50de am:
84f488f354 am:
ebdad60d6b
am:
fc598c54d9
* commit '
fc598c54d945c48ade547a52a01e2e704df1618b':
Sanity check IMemory access versus underlying mmap
Christopher Tate [Wed, 17 Feb 2016 19:16:19 +0000 (19:16 +0000)]
Sanity check IMemory access versus underlying mmap am:
94b0d4e3ab am:
ef6908e2b3 am:
97f49e50de am:
84f488f354
am:
ebdad60d6b
* commit '
ebdad60d6b0560493e50092c30888d3a7b5cc8c9':
Sanity check IMemory access versus underlying mmap
Christopher Tate [Wed, 17 Feb 2016 19:10:12 +0000 (19:10 +0000)]
Sanity check IMemory access versus underlying mmap am:
94b0d4e3ab am:
ef6908e2b3 am:
97f49e50de
am:
84f488f354
* commit '
84f488f354c33a7ece30cb569c85cd91f0259066':
Sanity check IMemory access versus underlying mmap
Christopher Tate [Wed, 17 Feb 2016 18:57:42 +0000 (18:57 +0000)]
Sanity check IMemory access versus underlying mmap am:
94b0d4e3ab am:
ef6908e2b3
am:
97f49e50de
* commit '
97f49e50ded651f1ddcf8a9981a7d97fe2816ad7':
Sanity check IMemory access versus underlying mmap
Christopher Tate [Wed, 17 Feb 2016 18:44:11 +0000 (18:44 +0000)]
Sanity check IMemory access versus underlying mmap am:
94b0d4e3ab
am:
ef6908e2b3
* commit '
ef6908e2b3e6ee6514620acc338b458ade7c3640':
Sanity check IMemory access versus underlying mmap
Christopher Tate [Wed, 17 Feb 2016 18:37:52 +0000 (18:37 +0000)]
Sanity check IMemory access versus underlying mmap
am:
94b0d4e3ab
* commit '
94b0d4e3ab023cfa03a7a4e85f3e09d3743da715':
Sanity check IMemory access versus underlying mmap
Christopher Tate [Sat, 6 Feb 2016 03:02:56 +0000 (19:02 -0800)]
Sanity check IMemory access versus underlying mmap
Bug
26877992
Change-Id: Ibbf4b1061e4675e4e96bc944a865b53eaf6984fe
Pablo Ceballos [Fri, 12 Feb 2016 02:01:49 +0000 (18:01 -0800)]
BQ: Add permission check to BufferQueueConsumer::dump
Bug
27046057
Change-Id: Id7bd8cf95045b497943ea39dde49e877aa6f5c4e
Pablo Ceballos [Fri, 12 Feb 2016 03:15:35 +0000 (19:15 -0800)]
DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump
Bug
27046057
Change-Id: I387178708f460596433f75bb059854a26cc22e78
Alain Vongsouvanh [Fri, 29 Jan 2016 21:15:39 +0000 (21:15 +0000)]
Merge changes I68ed9d1c,I4ebccfd0,I3507bdfd,Iaf02f55c into cw-e-dev
* changes:
system_server BINDER_TYPE_FD sockets using ashmem accessors
Parcel: file descriptor leak
Parcel: include Android coding standard
Parcel: LOG_TAG cleanup
Mark Salyzyn [Wed, 27 Jan 2016 16:02:48 +0000 (08:02 -0800)]
system_server BINDER_TYPE_FD sockets using ashmem accessors
check if device is a character device, before calling
ashmem_get_size_region. We do not check if the st_rdev
matches /dev/ashmem. So this at least eliminates making
this call when associated with a socket.
Bug:
26374183
Change-Id: I68ed9d1c2cd4c47228ed065e3e18eb4151f038f4
(cherry picked from AOSP commit
eab2afc7ac5183750a23693ecee89dad7f7abf5f)
Mark Salyzyn [Wed, 27 Jan 2016 16:02:48 +0000 (08:02 -0800)]
Parcel: file descriptor leak
Resolve a file descriptor leak when a request for
ashmem size adjustment is not filed.
Change-Id: I4ebccfd096ec5313725fd99dc3e025f9561d061f
(cherry picked from AOSP commit
b454d8ffa928e33dd54c979a747994acbd117397)
Mark Salyzyn [Wed, 27 Jan 2016 16:02:48 +0000 (08:02 -0800)]
Parcel: include Android coding standard
Change-Id: I3507bdfd04a06db85b46539338c787395ec652ff
(cherry picked from AOSP commit
abed7f7aebdbdd20fdb37d0d6e79e50905c7f5d5)
Mark Salyzyn [Wed, 27 Jan 2016 16:02:48 +0000 (08:02 -0800)]
Parcel: LOG_TAG cleanup
NB: several ALOG messages behind comments, recommend removal
Change-Id: Iaf02f55cbf7ef0ee7c4a6ee67c7f8b57cf97cd26
(cherry picked from AOSP commit
e93390b0bd336cd1b69abebf6eeffd18881f531b)
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: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)]
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)]
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: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: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)]
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: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: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 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 [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
Prashant Malani [Tue, 8 Dec 2015 01:27:17 +0000 (01:27 +0000)]
Merge "inputflinger: Initial support for rotary encoders." into cw-e-dev
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 [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 [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
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 [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: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: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: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: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: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
OSDN Git Service
