OSDN Git Service
Christopher Wiley [Mon, 1 Feb 2016 21:44:00 +0000 (21:44 +0000)]
Merge "Add support for decoding UTF16 to UTF8" am:
ac4728f8ba
am:
7b0c8479ae
* commit '
7b0c8479ae68c6596df21879c6470ff21560ea03':
Add support for decoding UTF16 to UTF8
Christopher Wiley [Mon, 1 Feb 2016 21:41:56 +0000 (21:41 +0000)]
Merge "Add support for decoding UTF16 to UTF8"
am:
ac4728f8ba
* commit '
ac4728f8ba54e5f25466efeaf65a1dbda179ca97':
Add support for decoding UTF16 to UTF8
Christopher Wiley [Mon, 1 Feb 2016 21:40:33 +0000 (21:40 +0000)]
Merge "Add support for decoding UTF16 to UTF8"
Christopher Wiley [Fri, 29 Jan 2016 00:56:53 +0000 (16:56 -0800)]
Add support for decoding UTF16 to UTF8
This is helpful because many native service developers use std::string
internally, and String16 doesn't work very well with many C++
primitives.
Bug:
26729450
Test: Integration test appears to show this is correct.
Change-Id: Ib75068881da28fd8515685bcbcbe864ba3b7ec23
Alain Vongsouvanh [Fri, 29 Jan 2016 21:25:05 +0000 (21:25 +0000)]
Merge changes I68ed9d1c,I4ebccfd0,I3507bdfd,Iaf02f55c into cw-e-dev am:
d6ad64f894 am:
a20eb797c4
am:
7452d20732
* commit '
7452d20732d5dfe75cff21bc70e59b6a47c659e4':
system_server BINDER_TYPE_FD sockets using ashmem accessors
Parcel: file descriptor leak
Parcel: include Android coding standard
Parcel: LOG_TAG cleanup
Alain Vongsouvanh [Fri, 29 Jan 2016 21:21:57 +0000 (21:21 +0000)]
Merge changes I68ed9d1c,I4ebccfd0,I3507bdfd,Iaf02f55c into cw-e-dev am:
d6ad64f894
am:
a20eb797c4
* commit '
a20eb797c462189ba6641308d80e638501db0a18':
system_server BINDER_TYPE_FD sockets using ashmem accessors
Parcel: file descriptor leak
Parcel: include Android coding standard
Parcel: LOG_TAG cleanup
Alain Vongsouvanh [Fri, 29 Jan 2016 21:18:22 +0000 (21:18 +0000)]
Merge changes I68ed9d1c,I4ebccfd0,I3507bdfd,Iaf02f55c into cw-e-dev
am:
d6ad64f894
* commit '
d6ad64f89439b61eb1af2e5d8ca957c3887d9e56':
system_server BINDER_TYPE_FD sockets using ashmem accessors
Parcel: file descriptor leak
Parcel: include Android coding standard
Parcel: LOG_TAG cleanup
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)
Mathieu Chartier [Thu, 28 Jan 2016 19:17:22 +0000 (19:17 +0000)]
Merge "Application image support for installd DO NOT MERGE" am:
7f9c122ab9 -s ours
am:
3fa6da13b3 -s ours
* commit '
3fa6da13b307ce74d8778a4a1d6180043fd28b5a':
Application image support for installd DO NOT MERGE
Mathieu Chartier [Thu, 28 Jan 2016 19:15:10 +0000 (19:15 +0000)]
Merge "Application image support for installd DO NOT MERGE"
am:
7f9c122ab9 -s ours
* commit '
7f9c122ab98d84e54647541edf99e72dec86f6db':
Application image support for installd DO NOT MERGE
Mathieu Chartier [Thu, 28 Jan 2016 19:13:02 +0000 (19:13 +0000)]
Merge "Application image support for installd DO NOT MERGE"
Mathieu Chartier [Wed, 21 Oct 2015 21:05:28 +0000 (14:05 -0700)]
Application image support for installd DO NOT MERGE
DO NOT MERGE
sort of
(cherry picked from commit
edc8bc48fbf143e35578bf6cccf980dfab076196)
Bug:
22858531
Change-Id: I5a9dfcf67d2232e8755886085e9ba1bb37494d39
Mark Salyzyn [Wed, 27 Jan 2016 19:08:37 +0000 (19:08 +0000)]
Merge "system_server BINDER_TYPE_FD sockets using ashmem accessors"
am:
cf9944684f
* commit '
cf9944684f438a1c3a47ab16c3efa4fa5d57f921':
system_server BINDER_TYPE_FD sockets using ashmem accessors
Mark Salyzyn [Wed, 27 Jan 2016 19:04:53 +0000 (19:04 +0000)]
Merge "system_server BINDER_TYPE_FD sockets using ashmem accessors"
Mark Salyzyn [Wed, 27 Jan 2016 18:05:36 +0000 (18:05 +0000)]
Merge changes I4ebccfd0,I3507bdfd,Iaf02f55c
am:
acca0abaf1
* commit '
acca0abaf15318a6a260addd78566383bd4110a5':
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
Mark Salyzyn [Wed, 27 Jan 2016 17:59:58 +0000 (17:59 +0000)]
Merge changes I4ebccfd0,I3507bdfd,Iaf02f55c
* changes:
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)]
Parcel: file descriptor leak
Resolve a file descriptor leak when a request for
ashmem size adjustment is not filed.
Change-Id: I4ebccfd096ec5313725fd99dc3e025f9561d061f
Mark Salyzyn [Wed, 27 Jan 2016 16:02:48 +0000 (08:02 -0800)]
Parcel: include Android coding standard
Change-Id: I3507bdfd04a06db85b46539338c787395ec652ff
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
Mark Salyzyn [Tue, 26 Jan 2016 20:48:08 +0000 (20:48 +0000)]
Merge "Revert "dumpstate: Add security log dump""
am:
316923d359
* commit '
316923d3597af72d1cbd9eb2745a02706275fdb8':
Revert "dumpstate: Add security log dump"
Mark Salyzyn [Tue, 26 Jan 2016 20:41:51 +0000 (20:41 +0000)]
Merge "Revert "dumpstate: Add security log dump""
Nick Vaccaro [Tue, 26 Jan 2016 20:20:05 +0000 (20:20 +0000)]
Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev am:
ca19b6a4d3 -s ours am:
a0a1599d8b -s ours
am:
972e9479a7 -s ours
* commit '
972e9479a700d9d80aca7c036ed96ce6db4e78e5':
[DO NOT MERGE ANYWHERE] Fix bodysensor permission
Nick Vaccaro [Tue, 26 Jan 2016 20:17:31 +0000 (20:17 +0000)]
Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev am:
ca19b6a4d3 -s ours
am:
a0a1599d8b -s ours
* commit '
a0a1599d8b8d8da38a47a939864d6f80bf6b9a09':
[DO NOT MERGE ANYWHERE] Fix bodysensor permission
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
Mark Salyzyn [Tue, 26 Jan 2016 15:24:08 +0000 (07:24 -0800)]
Revert "dumpstate: Add security log dump"
This reverts commit
c7ad8cb82f035576c28707a8cbeb16b7ead2a4e7.
Bug:
26029733
Change-Id: I0c61f4d2c0aa9e07c6cc7b190d803e98c3a98d40
Martijn Coenen [Mon, 25 Jan 2016 09:51:45 +0000 (09:51 +0000)]
Merge "Implementation of HCE for NFC-F."
am:
695d489450
* commit '
695d489450cc6ce102979846fe5e8ac565d9151a':
Implementation of HCE for NFC-F.
Martijn Coenen [Mon, 25 Jan 2016 09:47:27 +0000 (09:47 +0000)]
Merge "Implementation of HCE for NFC-F."
Yoshinobu Ito [Mon, 18 Jan 2016 12:02:47 +0000 (21:02 +0900)]
Implementation of HCE for NFC-F.
This impementation includes HCE(Host-based Card Emulation) for NFC-F
which emulates NFC Forum Type 3 Tag on a smartphone.
Signed-off-by: Daisuke Ito <DaisukeE.Ito@jp.sony.com>
Yoshinobu Ito <Yoshinobu.Ito@jp.sony.com>
Change-Id: I1618a7fba801e0705ff3cc078206a1446b3dd56d
Robert Shih [Fri, 15 Jan 2016 02:03:07 +0000 (02:03 +0000)]
IGraphicBufferProducer: fix QUEUE_BUFFER info leak am:
d06421fd37 am:
413318311c am:
dc9ec35294 am:
9d959e2755 am:
edb7c81a1b am:
2a7a1247cb am:
40ba03fc68 am:
ea2b6c68e1 am:
6df23e81f7
am:
c748125025
* commit '
c7481250259144c2f7795408ad971f4a9319d996':
IGraphicBufferProducer: fix QUEUE_BUFFER info leak
Robert Shih [Fri, 15 Jan 2016 02:00:24 +0000 (02:00 +0000)]
IGraphicBufferProducer: fix QUEUE_BUFFER info leak am:
d06421fd37 am:
413318311c am:
dc9ec35294 am:
9d959e2755 am:
edb7c81a1b am:
2a7a1247cb am:
40ba03fc68 am:
ea2b6c68e1
am:
6df23e81f7
* commit '
6df23e81f762ec7bdf3d575582ad51aaef5172cf':
IGraphicBufferProducer: fix QUEUE_BUFFER info leak
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:56:25 +0000 (01:56 +0000)]
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak am:
dded8fdbb7 am:
7ee203b59d am:
dc252255af am:
202aaa8f97 am:
ec87aa5218 am:
c5cb7c489b am:
e8cceaf02f
am:
aef60500d2
* commit '
aef60500d2a505c3dbbea74f62053c0bb072d5a7':
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak
Robert Shih [Fri, 15 Jan 2016 01:54:27 +0000 (01:54 +0000)]
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak am:
dded8fdbb7 am:
7ee203b59d am:
dc252255af am:
202aaa8f97 am:
ec87aa5218 am:
c5cb7c489b
am:
e8cceaf02f
* commit '
e8cceaf02f7e15e1ef0c3446c4287ce58cc325ba':
IGraphicBufferConsumer: fix ATTACH_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:50:08 +0000 (18:50 +0000)]
Revert "inputflinger: Initial support for rotary encoders." am:
d983fd11d4 am:
b5458e3baf
am:
618b2dc4c8
* commit '
618b2dc4c898b13b786bd3b4a1d696e8744cc225':
Revert "inputflinger: Initial support for rotary encoders."
Prashant Malani [Wed, 13 Jan 2016 18:50:03 +0000 (18:50 +0000)]
Revert "inputflinger: Add support for scaling and true value reporting" am:
2c09b78656 am:
cd7ddc7cac
am:
918263dac8
* commit '
918263dac8f7572dd90eeaadda651e117f735653':
Revert "inputflinger: Add support for scaling and true value reporting"
Prashant Malani [Wed, 13 Jan 2016 18:46:52 +0000 (18:46 +0000)]
Revert "inputflinger: Initial support for rotary encoders." am:
d983fd11d4
am:
b5458e3baf
* commit '
b5458e3bafa3917e7cfda1e3200d112951a5a954':
Revert "inputflinger: Initial support for rotary encoders."
Prashant Malani [Wed, 13 Jan 2016 18:46:46 +0000 (18:46 +0000)]
Revert "inputflinger: Add support for scaling and true value reporting" am:
2c09b78656
am:
cd7ddc7cac
* commit '
cd7ddc7cac649f5630197d57bc098764c994aba6':
Revert "inputflinger: Add support for scaling and true value reporting"
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:37:31 +0000 (05:37 +0000)]
inputflinger: Add support for scaling and true value reporting am:
ee03865fe5 am:
a777e8b70f
am:
9363c7fa06
* commit '
9363c7fa063c45dc5e0bf35616928d1e036e2419':
inputflinger: Add support for scaling and true value reporting
Prashant Malani [Wed, 13 Jan 2016 05:35:45 +0000 (05:35 +0000)]
inputflinger: Add support for scaling and true value reporting am:
ee03865fe5
am:
a777e8b70f
* commit '
a777e8b70fce35e97dd8812df8b0b5eca17db550':
inputflinger: Add support for scaling and true value reporting
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
Samuel Tan [Tue, 12 Jan 2016 23:14:46 +0000 (23:14 +0000)]
Merge "Add PersistableBundle.aidl into binder includes"
am:
0904094574
* commit '
09040945744f8a8634d7472836d6be3506a77d41':
Add PersistableBundle.aidl into binder includes
Samuel Tan [Tue, 12 Jan 2016 23:09:44 +0000 (23:09 +0000)]
Merge "Add PersistableBundle.aidl into binder includes"
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
Samuel Tan [Mon, 21 Dec 2015 20:11:00 +0000 (12:11 -0800)]
Add PersistableBundle.aidl into binder includes
Add the PersistableBundle.aidl into the new /aidl/binder/
subdirectory (along with the necessary 'android' and 'os'
subdirectories) so that the aidl file will live alongside
its native implementation in libbinder. This change will
allow native-only Android checkouts (e.g. Brillo) to use
PersistableBundle.
The /aidl/ subdirectory should henceforth contain any
aidl files that live with native code.
BUG:
26292234
Change-Id: I07b49dad8afd679f33e41fa9044dffc02ec25e3e
Colin Cross [Tue, 5 Jan 2016 21:50:02 +0000 (21:50 +0000)]
Merge "libinstalld: add dependency on libselinux"
am:
9dee30750e
* commit '
9dee30750e85dcfc02fb9fd4cc6169957de91d0b':
libinstalld: add dependency on libselinux
Colin Cross [Tue, 5 Jan 2016 21:46:28 +0000 (21:46 +0000)]
Merge "libinstalld: add dependency on libselinux"
Nick Kralevich [Thu, 24 Dec 2015 03:16:38 +0000 (19:16 -0800)]
Merge "More O_CLOEXEC"
am:
43e4260831
* commit '
43e4260831cc3d0d96c05fe18a8cad3018b5795f':
More O_CLOEXEC
Nick Kralevich [Thu, 24 Dec 2015 02:59:16 +0000 (02:59 +0000)]
Merge "More O_CLOEXEC"
Nick Kralevich [Thu, 24 Dec 2015 02:58:05 +0000 (18:58 -0800)]
More O_CLOEXEC
Change-Id: I31991ed089f395174857e86e509b8190ad98f92a
Colin Cross [Tue, 22 Dec 2015 00:21:45 +0000 (16:21 -0800)]
libinstalld: add dependency on libselinux
libinstalld uses headers from libselinux, add a LOCAL_SHARED_LIBRARIES
dependency on libselinux.
Change-Id: Ic12c55547526638810bcc1ac952d205f2f163fd3
Mark Salyzyn [Fri, 18 Dec 2015 21:22:38 +0000 (21:22 +0000)]
dumpstate: increase logcat timeout to 40 seconds (DO NOT MERGE) am:
03d61d95fa
am:
dc482d7711 -s ours
* commit '
dc482d771158299d470f017d0bd5ada5db2a5a92':
dumpstate: increase logcat timeout to 40 seconds (DO NOT MERGE)
Mark Salyzyn [Fri, 18 Dec 2015 20:46:30 +0000 (20:46 +0000)]
dumpstate: increase logcat timeout to 40 seconds (DO NOT MERGE)
am:
03d61d95fa
* commit '
03d61d95fa6a321bf26548b320a1a9c8dc78e124':
dumpstate: increase logcat timeout to 40 seconds (DO NOT MERGE)
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
Samuel Tan [Thu, 17 Dec 2015 01:25:38 +0000 (01:25 +0000)]
Merge "Fix format specifiers for size_t types"
am:
0d77698233
* commit '
0d77698233ffcbc812c2586693546355ce521603':
Fix format specifiers for size_t types
Samuel Tan [Thu, 17 Dec 2015 01:19:10 +0000 (01:19 +0000)]
Merge "Fix format specifiers for size_t types"
Samuel Tan [Thu, 17 Dec 2015 01:13:29 +0000 (17:13 -0800)]
Fix format specifiers for size_t types
Use %zu instead of %u for logging size_t types, which
are of the unsigned long type, not the unsigned int type.
BUG: None
Change-Id: I5af6c2ea544a5f11b283bc9aebe8b5f0cfc605ec
Samuel Tan [Thu, 17 Dec 2015 00:48:42 +0000 (00:48 +0000)]
Merge "Add support for PersistableBundle in C++"
am:
aca58acb59
* commit '
aca58acb594efb35b51e49d2d330fe1dbe16d7fd':
Add support for PersistableBundle in C++
Samuel Tan [Thu, 17 Dec 2015 00:35:28 +0000 (00:35 +0000)]
Merge "Add support for PersistableBundle in C++"
Nick Kralevich [Wed, 16 Dec 2015 21:41:31 +0000 (21:41 +0000)]
Merge "atrace.rc: tracing should be disabled by default."
am:
cbd4cc737c
* commit '
cbd4cc737cc99b2ae7ac22ca4b2bb52b86b8e6ae':
atrace.rc: tracing should be disabled by default.
Nick Kralevich [Wed, 16 Dec 2015 21:31:46 +0000 (21:31 +0000)]
Merge "atrace.rc: tracing should be disabled by default."
Nick Kralevich [Wed, 16 Dec 2015 20:37:25 +0000 (12:37 -0800)]
atrace.rc: tracing should be disabled by default.
Bug:
26217098
Change-Id: I6066c433d19c2d1c220669a9a78f5085af8c1d4b
Casey Dahlin [Wed, 16 Dec 2015 00:49:46 +0000 (16:49 -0800)]
Merge "Allow null values for Parcel readers and writers"
am:
4df4842186
* commit '
4df484218624081ee5de68798fe8bbf26efdc069':
Allow null values for Parcel readers and writers
Casey Dahlin [Tue, 15 Dec 2015 21:04:16 +0000 (21:04 +0000)]
Merge "Allow null values for Parcel readers and writers"
Casey Dahlin [Wed, 25 Nov 2015 23:09:45 +0000 (15:09 -0800)]
Allow null values for Parcel readers and writers
Test: AIDL integration tests pass
Bug:
25969194
Change-Id: Ib7023c8e02af49e08c9921f1d097e5967c1d378e
Signed-off-by: Casey Dahlin <sadmac@google.com>
Casey Dahlin [Tue, 15 Dec 2015 01:46:50 +0000 (17:46 -0800)]
Merge "Don\'t redefine B_PACK_CHARS"
am:
478259b574
* commit '
478259b574b6353437b6d5a03caaa4449add428a':
Don't redefine B_PACK_CHARS
Casey Dahlin [Tue, 15 Dec 2015 01:09:50 +0000 (01:09 +0000)]
Merge "Don't redefine B_PACK_CHARS"
Casey Dahlin [Tue, 15 Dec 2015 00:09:06 +0000 (16:09 -0800)]
Don't redefine B_PACK_CHARS
Change-Id: I5dfaca405f0f866e697d5ae546ead8a8eb6de7ca
Test: make checkbuild succeeds
Bug:
25868260
Signed-off-by: Casey Dahlin <sadmac@google.com>
Felipe Leme [Mon, 14 Dec 2015 23:56:22 +0000 (23:56 +0000)]
Merge "Migrated dumpstate to C++."
am:
1f62517b36
* commit '
1f62517b3654a3c0e95ea4d5b3664fac8115acdf':
Migrated dumpstate to C++.
Felipe Leme [Mon, 14 Dec 2015 23:25:48 +0000 (23:25 +0000)]
Merge "Migrated dumpstate to C++."
Felipe Leme [Mon, 14 Dec 2015 23:09:56 +0000 (15:09 -0800)]
Migrated dumpstate to C++.
Changes required:
- Explicity casting function pointers.
- Moving variables initialization before 'goto' statements.
- Changing string references from 'char *' to 'const char *'.
- Using 'extern "C"' so device-dependent implementation of
'dumpstate_board()' can be written in C or C++.
BUG:
25563823
Change-Id: Ibeb70fd23e64e9b530736b554a372cb232fe1a44
Greg Hackmann [Mon, 14 Dec 2015 21:20:47 +0000 (13:20 -0800)]
Merge "atrace: add database tag"
am:
8b9c0e1af1
* commit '
8b9c0e1af14bf07b216edd1b995048790ddabaca':
atrace: add database tag
Samuel Tan [Tue, 24 Nov 2015 02:22:12 +0000 (18:22 -0800)]
Add support for PersistableBundle in C++
Add support for PersistableBundle, a mapping from
String values to various types, in C++.
BUG:
25815410
Change-Id: If609b294a1709314bb4220afc4f2269b556babb8
Greg Hackmann [Mon, 14 Dec 2015 21:12:52 +0000 (21:12 +0000)]
Merge "atrace: add database tag"
Mark Salyzyn [Mon, 14 Dec 2015 16:48:52 +0000 (08:48 -0800)]
Merge "dumpstate: Add security log dump"
am:
bc611a1d3e
* commit '
bc611a1d3e2beea849a251fecda096ed142519a6':
dumpstate: Add security log dump
OSDN Git Service
