Jesse Hall
74ae749099
am 01502981
: Merge "fix valgrind ioctl warning."
...
* commit '01502981cddb69b9ab7e4bf8bc66366ae0eb7035':
fix valgrind ioctl warning.
2014-03-20 16:31:37 +00:00
Jesse Hall
01502981cd
Merge "fix valgrind ioctl warning."
2014-03-20 16:09:15 +00:00
Fengwei Yin
0c7c81f5a6
make struct Event layout consistent on 32/64-bit
...
To make struct Event have consistent memory layout between x86
and x86_64, force nsecs_t timestamp align to 64bit because it's
not true for x86.
Change-Id: I49eaddd89e10d595cf6a5130f9762b5388c96625
Signed-off-by: Fengwei Yin <fengwei.yin@intel.com>
2014-03-20 16:49:06 +08:00
Michael Wright
38dcdff308
Generate ACTION_CANCEL on joystick disconnect.
...
Bug: 11480300
Change-Id: I46706838eec0711c6bf345301e7b4ccbad83b063
2014-03-20 01:54:00 +00:00
Michael Wright
dcfcf5d0ae
Add idc config option for handling key repeats
...
Bug: 13285870
Change-Id: I3c1cd5fb0a02dfb3432c1f04d0eef2d4970857ea
2014-03-20 01:14:06 +00:00
Paul Lawrence
d8e1f65273
batteryservice: Add battery capacity
...
Change-Id: I6879ec9ec931cbea82aa550b3b227e744255bfd4
2014-03-19 21:56:47 +00:00
Nick Kralevich
bb9c93bb6e
am 5d58e309
: am 1bf30245
: Merge "Extend installd to support SELinux restorecon function."
...
* commit '5d58e3092d70231da57140a7d9d9fbb87fd4b8e6':
Extend installd to support SELinux restorecon function.
2014-03-19 20:41:51 +00:00
Nick Kralevich
5d58e3092d
am 1bf30245
: Merge "Extend installd to support SELinux restorecon function."
...
* commit '1bf30245cbb8be7279fadcf4071cecc8db91789f':
Extend installd to support SELinux restorecon function.
2014-03-19 20:29:27 +00:00
Nick Kralevich
1bf30245cb
Merge "Extend installd to support SELinux restorecon function."
2014-03-19 20:17:24 +00:00
Robert Craig
e9887e46ce
Extend installd to support SELinux restorecon function.
...
Implement new restorecondata function which will allow
the relabeling of /data/data and /data/user directories.
This is needed in the case of certain OTAs. Not every
boot will apply this relabeling however. Consult change
I77bf2a0c4c34b1feef6fdf4d6c3bd92dbf32f4a1 for
clarification on this issue.
Change-Id: I05e8b438950ddb908e46c9168ea6ee601e6d674f
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2014-03-19 17:37:48 +00:00
Dan Stoza
02ab322c5e
Merge "Remove deprecated BufferQueue constructor"
2014-03-19 16:32:10 +00:00
Wonsik Kim
8ce5c1cc8d
Merge "Fill in sideband stream caveat"
2014-03-19 00:41:23 +00:00
Glenn Kasten
6546f2e458
Allow creation of heaps that are read-only to partner
...
Change-Id: I3c2b3d9b1671da4b9d9c58dce27e291d30703b03
2014-03-18 15:07:43 -07:00
Dan Stoza
75555b2eaf
Merge "BufferItemConsumer: Use IGBC instead of BQ"
2014-03-18 17:55:06 +00:00
Dan Stoza
b9b088375d
Remove deprecated BufferQueue constructor
...
Bug: 13415624
Change-Id: I9fe15e45daa7351f1db34ee75bfee6f19cb347d3
2014-03-18 10:08:44 -07:00
Dan Stoza
14226716f2
Merge "Remove deprecated BufferQueue constructor"
2014-03-18 16:56:15 +00:00
Andy McFadden
74d8acd7fc
Merge "Added null check"
2014-03-18 15:20:24 +00:00
Wonsik Kim
8bf3b1a496
Merge "Revert "Implement video plane layer""
2014-03-18 01:00:44 +00:00
Andy McFadden
bc96e4714f
Added null check
...
Don't dereference "handle" if it's NULL.
Bug 13348578
Change-Id: Ifa6758616c41cf84467af6db29c779d26901a01c
2014-03-17 16:48:23 -07:00
Kenny Root
75d8406934
am ca609e43
: am 38e2aaaa
: am 5b61ad2c
: Check the padded size of the read byte array
...
* commit 'ca609e4300d88ad1e815581ebc6a478b446d3882':
Check the padded size of the read byte array
2014-03-17 23:32:59 +00:00
Adam Lesinski
20dba7e3ab
am 80acb20c
: am 7cd122a5
: Merge "Add device admin to wearables for API8 Compat" into klp-modular-dev
...
* commit '80acb20ca95da161fc739abac0fb9084a76e2ced':
Add device admin to wearables for API8 Compat
2014-03-17 23:32:28 +00:00
Adam Lesinski
28cd297db6
am aa89a914
: am fc34b7b7
: Merge "Remove accessibility as an optional feature" into klp-modular-dev
...
* commit 'aa89a914825a79e535917c2f0da6cad1d1ed9f2d':
Remove accessibility as an optional feature
2014-03-17 23:32:27 +00:00
Kenny Root
ca609e4300
am 38e2aaaa
: am 5b61ad2c
: Check the padded size of the read byte array
...
* commit '38e2aaaa3dd62a20eb211808ae6fe45ec37ee6d5':
Check the padded size of the read byte array
2014-03-17 21:31:04 +00:00
Kenny Root
38e2aaaa3d
am 5b61ad2c
: Check the padded size of the read byte array
...
* commit '5b61ad2cda8ec8ab634ce02f388bb2d3c5ab048d':
Check the padded size of the read byte array
2014-03-17 21:28:34 +00:00
Kenny Root
5b61ad2cda
Check the padded size of the read byte array
...
Bug: 13509200
Change-Id: Id93894fcc617ec1cd4ce66921c6e1f1c3cf40b09
2014-03-17 13:18:16 -07:00
Adam Lesinski
80acb20ca9
am 7cd122a5
: Merge "Add device admin to wearables for API8 Compat" into klp-modular-dev
...
* commit '7cd122a549831611ce79389e481484ade16744f1':
Add device admin to wearables for API8 Compat
2014-03-17 19:52:35 +00:00
Adam Lesinski
aa89a91482
am fc34b7b7
: Merge "Remove accessibility as an optional feature" into klp-modular-dev
...
* commit 'fc34b7b7fc9749a3fb1f8e7d924274a5768366aa':
Remove accessibility as an optional feature
2014-03-17 19:52:34 +00:00
Adam Lesinski
7cd122a549
Merge "Add device admin to wearables for API8 Compat" into klp-modular-dev
2014-03-17 19:50:56 +00:00
Adam Lesinski
fc34b7b7fc
Merge "Remove accessibility as an optional feature" into klp-modular-dev
2014-03-17 19:50:31 +00:00
Adam Lesinski
0f5d4dde76
Add device admin to wearables for API8 Compat
...
Bug:13386441
Change-Id: I8814976db791bb1f2e60b6a9fc49afdd5f360414
2014-03-17 12:19:18 -07:00
Adam Lesinski
de7388bf1d
Remove accessibility as an optional feature
...
Bug:13439904
Change-Id: Icc6b84d05a24cbfdaa121929e7c7c77c0f7eed17
2014-03-17 12:16:25 -07:00
Dan Stoza
2c22093c1c
Merge "Remove deprecated BufferQueue constructor"
2014-03-17 18:46:14 +00:00
Marco Nelissen
37b44969c0
Add support for writing byte arrays to parcels
...
b/13418320
Cherrypicked from f0190bff38
https://googleplex-android-review.git.corp.google.com/#/c/433320/
Change-Id: I2285df9e9d3dc8a6a54055b13b352b81660bf45d
2014-03-17 11:13:30 -07:00
Wonsik Kim
29fa9590ad
Revert "Implement video plane layer"
...
This reverts commit f837c93a1b
.
Change-Id: I6a1aa9ad0aca023267dc53d19c950b1535123ca7
2014-03-17 11:17:28 +00:00
Wonsik Kim
0ee14ca23d
Fill in sideband stream caveat
...
Change-Id: I20db8aea8f13acf31b42db08d90b338da8a5209c
2014-03-17 17:46:53 +09:00
Marco Nelissen
ce9f107c9d
am 793be12c
: am b730a452
: am f0190bff
: Add support for writing byte arrays to parcels
...
* commit '793be12c0f5a7878d1085e94e58a9c36c84f0911':
Add support for writing byte arrays to parcels
2014-03-15 00:30:46 +00:00
Marco Nelissen
793be12c0f
am b730a452
: am f0190bff
: Add support for writing byte arrays to parcels
...
* commit 'b730a45216991cf22c39451c47393b4bccae111b':
Add support for writing byte arrays to parcels
2014-03-14 23:33:08 +00:00
Marco Nelissen
b730a45216
am f0190bff
: Add support for writing byte arrays to parcels
...
* commit 'f0190bff38b6c29abbfc4a877442f71fc3d7dad8':
Add support for writing byte arrays to parcels
2014-03-14 22:55:54 +00:00
Mark Salyzyn
993146092f
am d4dabf87
: am cdbf28b3
: Merge "native frameworks: 64-bit compile issues"
...
* commit 'd4dabf872ac0a12e12aebae9032f7d62762c2aeb':
native frameworks: 64-bit compile issues
2014-03-13 23:12:09 +00:00
Jesse Hall
49bfda1fbd
Fix broken build for more tests
...
Change-Id: I7bdd12a833233724805d01d993541ee05caa9bf6
2014-03-13 15:09:17 -07:00
Jesse Hall
85c0fee024
Fix broken test build
...
Change-Id: I767bcefd92899334e4769dd3495595f546133694
2014-03-13 14:34:28 -07:00
Marco Nelissen
f0190bff38
Add support for writing byte arrays to parcels
...
b/13418320
Change-Id: I2285df9e9d3dc8a6a54055b13b352b81660bf45d
2014-03-13 14:17:40 -07:00
Jesse Hall
73ed82f809
Merge "Add sideband streams to BufferQueue and related classes"
2014-03-13 20:28:17 +00:00
Dan Stoza
6d5a7bb970
Remove deprecated BufferQueue constructor
...
Bug: 13415624
Change-Id: I52f58a4d22296d9fc3cdbd4ad53eb10a785db3ce
2014-03-13 11:39:09 -07:00
Dan Stoza
6780a2d6a5
Remove deprecated BufferQueue constructor
...
Bug: 13415624
Change-Id: I1c17833511b5961af5a9bbb9cc3d627ce558d424
2014-03-13 11:31:43 -07:00
Dan Stoza
fe50d2a0a1
BufferItemConsumer: Use IGBC instead of BQ
...
Change-Id: Id1756ac62954ba412f2c23c5fa6e5d760c299347
2014-03-13 11:12:04 -07:00
Mark Salyzyn
d4dabf872a
am cdbf28b3
: Merge "native frameworks: 64-bit compile issues"
...
* commit 'cdbf28b3f7f5327f4cb0eb95b8326bf4c24c87ba':
native frameworks: 64-bit compile issues
2014-03-13 15:26:10 +00:00
Mark Salyzyn
cdbf28b3f7
Merge "native frameworks: 64-bit compile issues"
2014-03-13 15:20:45 +00:00
RoboErik
a3f519fe6f
am ffd353a7
: (-s ours) am d9e113f0
: b/12068020 add nonce to InputDeviceDescriptor. Do not merge
...
* commit 'ffd353a73eb7794ef556c4e646f866b580a03abb':
b/12068020 add nonce to InputDeviceDescriptor. Do not merge
2014-03-12 23:04:49 +00:00
Michael Wright
0c28f11e22
Merge "Controllers must have buttons and a movement mechanism."
2014-03-12 21:56:24 +00:00