Jeff Tinker
98e5bf2cc0
Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev
2014-04-01 21:54:35 +00:00
Jeff Tinker
c2f10f20ec
Support CAST V2 Authentication in MediaDrm
...
Update frameworks to enable support for CAST
V2 Authentication in the DRM Plugin.
Change-Id: Ic38f0e1484b1388dd87f4591c74984cb724d50e2
related-to-bug: 12702350
2014-03-29 08:41:39 -07:00
Michael Wright
773585e60c
Merge "Generate ACTION_CANCEL on joystick disconnect. DO NOT MERGE" into klp-modular-dev
2014-03-28 19:33:36 +00:00
Xia Wang
a0da27d546
am 9c7db080
: Build the benchmark test to /data/local/tmp/ for automated test
...
* commit '9c7db08049e1d36c2f60dd703f27c432bc8cfbc5':
Build the benchmark test to /data/local/tmp/ for automated test
2014-03-25 03:46:32 +00:00
Michael Wright
d0bd391146
Generate ACTION_CANCEL on joystick disconnect. DO NOT MERGE
...
Bug: 11480300
Change-Id: I5a4096970c9e588d134f05dd0eb3a9c91c836b2f
2014-03-24 17:26:52 -07:00
Xia Wang
9c7db08049
Build the benchmark test to /data/local/tmp/ for automated test
...
Change-Id: I27a5ee24636ff9752a35dbab793821f6b7a79221
(cherry picked from commit b7925f1364
)
2014-03-24 18:13:19 +00:00
Marco Nelissen
40c68757ef
am 897fe45c
: am 23c2fcbb
: (-s ours) am c0af9caf
: am b14d72bc
: am d070009e
: am df6774c9
: am 7c1cdbdd
: am e23f8b8f
: am 1f70863d
: am 37b44969
: Add support for writing byte arrays to parcels
...
* commit '897fe45cf7addc975fc7f9751c88ac53d9b9a778':
Add support for writing byte arrays to parcels
2014-03-20 20:57:13 +00:00
Marco Nelissen
897fe45cf7
am 23c2fcbb
: (-s ours) am c0af9caf
: am b14d72bc
: am d070009e
: am df6774c9
: am 7c1cdbdd
: am e23f8b8f
: am 1f70863d
: am 37b44969
: Add support for writing byte arrays to parcels
...
* commit '23c2fcbbf4be87580e64132150aa554b764425c2':
Add support for writing byte arrays to parcels
2014-03-20 20:48:45 +00:00
Marco Nelissen
23c2fcbbf4
am c0af9caf
: am b14d72bc
: am d070009e
: am df6774c9
: am 7c1cdbdd
: am e23f8b8f
: am 1f70863d
: am 37b44969
: Add support for writing byte arrays to parcels
...
* commit 'c0af9cafba1217e2585777964730c70e40957dcd':
Add support for writing byte arrays to parcels
2014-03-20 13:26:08 -07:00
Marco Nelissen
c0af9cafba
am b14d72bc
: am d070009e
: am df6774c9
: am 7c1cdbdd
: am e23f8b8f
: am 1f70863d
: am 37b44969
: Add support for writing byte arrays to parcels
...
* commit 'b14d72bce04e990639305890b2aca3ccad5b3ebb':
Add support for writing byte arrays to parcels
2014-03-20 13:13:23 -07:00
Marco Nelissen
b14d72bce0
am d070009e
: am df6774c9
: am 7c1cdbdd
: am e23f8b8f
: am 1f70863d
: am 37b44969
: Add support for writing byte arrays to parcels
...
* commit 'd070009ecdb9e8c58ce5d1540d5bcba5587a0448':
Add support for writing byte arrays to parcels
2014-03-20 11:11:18 -07:00
Marco Nelissen
d070009ecd
am df6774c9
: am 7c1cdbdd
: am e23f8b8f
: am 1f70863d
: am 37b44969
: Add support for writing byte arrays to parcels
...
* commit 'df6774c9a3c1460554208925f38dde08953b6d0b':
Add support for writing byte arrays to parcels
2014-03-20 11:06:54 -07:00
Marco Nelissen
df6774c9a3
am 7c1cdbdd
: am e23f8b8f
: am 1f70863d
: am 37b44969
: Add support for writing byte arrays to parcels
...
* commit '7c1cdbdd68c4f809dc5616654740ea98a275892d':
Add support for writing byte arrays to parcels
2014-03-20 10:55:05 -07:00
Marco Nelissen
7c1cdbdd68
am e23f8b8f
: am 1f70863d
: am 37b44969
: Add support for writing byte arrays to parcels
...
* commit 'e23f8b8f0bf32e79c1d0f9183c064ab61354c452':
Add support for writing byte arrays to parcels
2014-03-20 10:48:35 -07:00
Marco Nelissen
e23f8b8f0b
am 1f70863d
: am 37b44969
: Add support for writing byte arrays to parcels
...
* commit '1f70863d13668dc97047df15cce547ebc8435ff2':
Add support for writing byte arrays to parcels
2014-03-20 10:33:12 -07:00
Marco Nelissen
1f70863d13
am 37b44969
: Add support for writing byte arrays to parcels
...
* commit '37b44969c0ca1d00e213da685dfbb2807f2bab30':
Add support for writing byte arrays to parcels
2014-03-20 10:04:42 -07: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
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
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
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
Marco Nelissen
f0190bff38
Add support for writing byte arrays to parcels
...
b/13418320
Change-Id: I2285df9e9d3dc8a6a54055b13b352b81660bf45d
2014-03-13 14:17:40 -07:00
RoboErik
d9e113f0e0
b/12068020 add nonce to InputDeviceDescriptor. Do not merge
...
This is a cherry-pick of https://googleplex-android-review.git.corp.google.com/#/c/401795/
Adds a nonce field to allow generation of unique descriptors for
input devices.
Change-Id: Ie82bfb728bea95792b3b138dd3974f8b0aff63e0
2014-03-12 12:51:54 -07:00
Michael Wright
9b04f860f2
Add MAX_CONTROLLER_LEDS constant. DO NOT MERGE
...
Change-Id: Ie6dbce926280c748f39e3c54d2ed4accbdcf9e59
2014-03-11 14:19:33 -07:00
Jeff Brown
37bf0789f5
Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
...
Bug: 12938999
Change-Id: I544661b3887332998d703b7b2df9e56c23ab48c4
2014-03-07 13:57:59 -08:00
Aravind Akella
3a867ddcdc
am 19d64819
: Bug fix for SensorFusion data rate.
...
* commit '19d648195673b106152610e3787c95886946460f':
Bug fix for SensorFusion data rate.
2014-03-06 22:16:15 +00:00
Aravind Akella
19d6481956
Bug fix for SensorFusion data rate.
...
SensorFusion is always returning data at the slowest possible sampling rate (5 Hz). batch() is getting called twice, first time with the requested rate and second time with the slowest rate (which overwrites the requested rate). Fix batch call in SensorFusion::activate()
Bug: 12064319
Change-Id: If62f3e514233f69810336fd22b136b4395b667d3
(cherry picked from commit 8850909038
)
2014-03-06 19:07:18 +00:00
Aravind Akella
8ae7c02e6f
am ffac23b2
: am 4b84704b
: Ignore flush complete events when recording last value for a sensor.
...
* commit 'ffac23b210a96e769fd79ae912b44a185e7d69bd':
Ignore flush complete events when recording last value for a sensor.
2014-03-06 02:24:29 +00:00
Aravind Akella
ffac23b210
am 4b84704b
: Ignore flush complete events when recording last value for a sensor.
...
* commit '4b84704b97300eff3ebfab85652e64d54149d205':
Ignore flush complete events when recording last value for a sensor.
2014-03-06 02:18:29 +00:00
Aravind Akella
4b84704b97
Ignore flush complete events when recording last value for a sensor.
...
Bug: 11822806
Change-Id: I1402d6684ed71ed413aef6a7be3aad945b331ec2
2014-03-06 00:48:59 +00:00
Michael Wright
1298c7e527
Merge "Parse LED mappings in keylayout files. DO NOT MERGE" into klp-modular-dev
2014-03-05 00:51:43 +00:00
Michael Wright
962a108856
Parse LED mappings in keylayout files. DO NOT MERGE
...
Change-Id: I2b34939cc0df256e6b872502ea93f2884b4c8334
2014-03-03 13:59:35 -08:00
Simon Wilson
6e79cb81d0
Enable OMAP4 SGX workaround for OMAP3 too
...
Change-Id: I04308d8b7435b4adf1811f75f48f9e8a07a8c8a6
2014-02-28 14:30:39 -08:00
Arve Hjønnevåg
d5a354c6b7
am d06f6b00
: am 67903293
: Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
...
* commit 'd06f6b001484c28a6ede3f1ad83d23dcb9ad3ccf':
Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
2014-02-20 00:04:44 +00:00
Arve Hjønnevåg
d06f6b0014
am 67903293
: Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
...
* commit '6790329358d1c84af2fe9ba093bcfc1c6176e758':
Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
2014-02-20 00:00:49 +00:00
Arve Hjønnevåg
6790329358
Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
...
DO NOT MERGE into any branch that uses the new interface
Change-Id: Id54308a89327e69a389ac5916c052ad97f57cb28
2014-02-19 15:35:52 -08:00
Arve Hjønnevåg
e45636a867
am d437364e
: am f50b9eaa
: Binder: Make sure binder objects do not overlap
...
* commit 'd437364ec156e07c5fbe3fa27a7cd55e5450e9f6':
Binder: Make sure binder objects do not overlap
2014-02-19 21:47:35 +00:00
Arve Hjønnevåg
d437364ec1
am f50b9eaa
: Binder: Make sure binder objects do not overlap
...
* commit 'f50b9eaaeeaeae16981f11b05d3f3a6fb0dea30d':
Binder: Make sure binder objects do not overlap
2014-02-19 21:45:25 +00:00
Andy McFadden
44c35ec4a9
Allow "opaque" flag to be updated. DO NOT MERGE
...
Moves the "opaque layer" from Layer to Layer::State. This allows
it to be updated as part of a transaction.
Bug 12387406
Change-Id: I0a114ce6adf77cd12fb08f96e0691b76c475768d
2014-02-18 15:55:42 -08:00
Arve Hjønnevåg
f50b9eaaee
Binder: Make sure binder objects do not overlap
...
Fixes crashing part of bug 11355082.
The driver still leaks references.
Change-Id: Ibc6a63b151c1fc1f7666237f25255ba781e02071
2014-02-15 03:44:17 +00:00
Jeff Brown
ed4d28dd70
Add method to apply offset to PointerCoords. (DO NOT MERGE)
...
Change-Id: I3dc2ba22b026e5b8e1c3d90f7366ec09a59ce6b6
2014-02-11 14:43:19 -08:00
Adam Lesinski
0f0ccf07ba
Add new software features
...
Wearable devices are much more stripped down than
handheld and tablet devices. There are system
services that must not be present on wearable
devices. Those services have their own feature
xml files that get copied to the system image
as needed. They are included by default in the
handheld and tablet core feature files in order
to maintain previous behavior.
Wearable devices should always copy the
data/etc/wearable_core_hardware.xml file and
whatever other files that represent required
services (eg. data/etc/android.software.print.xml).
Change-Id: I410442d45854fe54cba1131ce488a5a459ac580a
2014-02-05 19:35:57 +00:00
Changwan Ryu
e636692a2e
[DO NOT MERGE] Extend OpenMAX IL definitions to support AC3
...
OpenMAX IL does not have generic support for AC3, but IL 1.1.2 and above
supports component extension APIs, which enable us to add our own constants
and definitions.
Change-Id: Iecee4f8bb3112b0720ceae9192017e12d3fe97e3
2014-02-03 14:10:18 +09:00
Aravind Akella
ebff73c37d
Bug fix for SensorFusion data rate.
...
SensorFusion is always returning data at the slowest possible sampling rate (5 Hz). batch() is getting called twice, first time with the requested rate and second time with the slowest rate (which overwrites the requested rate). Fix batch call in SensorFusion::activate()
Bug: 12064319
Change-Id: If62f3e514233f69810336fd22b136b4395b667d3
2014-01-31 22:33:51 +00:00
Jesse Hall
ade9a911d0
am f65ebc3b
: am f5bcb391
: Merge "SurfaceFlinger: mFbProducerSlot initailization"
...
* commit 'f65ebc3be4d3a2e4c71c401d0e53f2ad5798be2a':
SurfaceFlinger: mFbProducerSlot initailization
2014-01-28 18:24:10 +00:00
Jesse Hall
f65ebc3be4
am f5bcb391
: Merge "SurfaceFlinger: mFbProducerSlot initailization"
...
* commit 'f5bcb391c5a4282fa5fe14856faf1423a2bc44c5':
SurfaceFlinger: mFbProducerSlot initailization
2014-01-28 18:22:35 +00:00
Jesse Hall
f5bcb391c5
Merge "SurfaceFlinger: mFbProducerSlot initailization"
2014-01-28 18:17:46 +00:00