Etienne Le Grand
b3a65bb0c2
am 9dcd38ad
: Merge "Add heart rate to ASensorEvent" into klp-modular-dev
...
* commit '9dcd38ad3b8335308b59932718e3f145aa50d318':
Add heart rate to ASensorEvent
2014-05-27 18:10:16 +00:00
Etienne Le Grand
9dcd38ad3b
Merge "Add heart rate to ASensorEvent" into klp-modular-dev
2014-05-27 18:02:49 +00:00
Etienne Le Grand
630e31d6ed
Add heart rate to ASensorEvent
...
Change-Id: Ic82838b17a575de93d499e44a454bb382f17678f
2014-05-23 12:35:10 -07:00
Aravind Akella
040730e895
am 1236710b
: Remove getRequiredPermission from NDK.
...
* commit '1236710bccd8f5870c0281e24a899c3d58f708e6':
Remove getRequiredPermission from NDK.
2014-05-22 22:44:55 +00:00
Aravind Akella
1236710bcc
Remove getRequiredPermission from NDK.
...
Change-Id: Ic967adde89f30261c75fca67c09d14d35bd1cdb3
2014-05-22 13:19:49 -07:00
Narayan Kamath
f8c66b4bee
am cfba3bf1
: am c9fcaf37
: Merge "Change InputMessage.motion.pointerSize to a uint32_t."
...
* commit 'cfba3bf1606dfdb1daf1be1c19176180660ae19d':
Change InputMessage.motion.pointerSize to a uint32_t.
2014-05-16 12:10:21 +00:00
Narayan Kamath
cfba3bf160
am c9fcaf37
: Merge "Change InputMessage.motion.pointerSize to a uint32_t."
...
* commit 'c9fcaf3751af078ad730913304431197e4d1ae80':
Change InputMessage.motion.pointerSize to a uint32_t.
2014-05-16 12:08:06 +00:00
Narayan Kamath
ed5fd384b7
Change InputMessage.motion.pointerSize to a uint32_t.
...
This ensures it's the same size in both 32 and 64 bit
processes and also brings it in line with struct
MotionEntry.
(cherry-picked from bc6001b026
)
Change-Id: I28e87050478920a54132efbbb8138076ebad1409
2014-05-16 12:53:16 +01:00
Greg Hackmann
38c9e1327a
am c1ffd351
: am bd20e551
: Merge "Use asynchronous lock/unlock API"
...
* commit 'c1ffd351bc44483369271c11dd4c6391bba8c64c':
Use asynchronous lock/unlock API
2014-05-12 18:12:34 +00:00
Greg Hackmann
c1ffd351bc
am bd20e551
: Merge "Use asynchronous lock/unlock API"
...
* commit 'bd20e551f64234142e1146f9fa4b2dcebbd72122':
Use asynchronous lock/unlock API
2014-05-12 18:08:13 +00:00
Francis Hart
8f3960179c
Use asynchronous lock/unlock API
...
The gralloc API now provides a way for using lock/unlock with the Android
explicit synchronisation concept. This changes updates the GraphicBuffer class
to also expose this functionality, and updates the Surface class to make use of
in line with the dequeueBuffer/queueBuffer mechanism.
This new behaviour is dependent on GRALLOC_MODULE_API_VERSION_0_3. If the local
gralloc module does not support this then the existing synchronous lock/unlock
mechanism will be used.
Change-Id: I8c3fd9592e0c5400ac9be84450f55a77cc0bbdc5
2014-05-12 09:13:03 -07:00
Greg Hackmann
9493d4924a
am 9eb142e3
: am a9d49f99
: Merge "Revert "Use asynchronous lock/unlock API""
...
* commit '9eb142e34a5bc11508c0bd6f60ad3933c60aa530':
Revert "Use asynchronous lock/unlock API"
2014-05-09 21:51:51 +00:00
Greg Hackmann
9eb142e34a
am a9d49f99
: Merge "Revert "Use asynchronous lock/unlock API""
...
* commit 'a9d49f99e69d8fc0e60b492b131322c96f47a232':
Revert "Use asynchronous lock/unlock API"
2014-05-09 21:46:44 +00:00
Greg Hackmann
53ec72523a
Revert "Use asynchronous lock/unlock API"
...
This reverts commit 378ef07760
.
Change-Id: I1de5ab973b5383633e75924fe90ac3ca8216c36a
2014-05-09 21:36:48 +00:00
Greg Hackmann
4b46776ff8
am 8a6cd189
: am f60564a1
: Merge "Use asynchronous lock/unlock API"
...
* commit '8a6cd189034ec4709a66e581b41deba56c028291':
Use asynchronous lock/unlock API
2014-05-09 21:13:16 +00:00
Greg Hackmann
8a6cd18903
am f60564a1
: Merge "Use asynchronous lock/unlock API"
...
* commit 'f60564a13e917877c76c99294194a621d872076b':
Use asynchronous lock/unlock API
2014-05-09 21:08:39 +00:00
Francis Hart
378ef07760
Use asynchronous lock/unlock API
...
The gralloc API now provides a way for using lock/unlock with the Android
explicit synchronisation concept. This changes updates the GraphicBuffer class
to also expose this functionality, and updates the Surface class to make use of
in line with the dequeueBuffer/queueBuffer mechanism.
This new behaviour is dependent on GRALLOC_MODULE_API_VERSION_0_3. If the local
gralloc module does not support this then the existing synchronous lock/unlock
mechanism will be used.
Change-Id: I77daa1beb197b63b1c2f281b8414ac4ae4b5b03c
2014-05-02 13:28:14 -07:00
Bill Yi
e4f00b2aae
Merge commit '6d05ef2310bdc84811d5b0385b009ad11447a749' into HEAD
2014-04-29 11:34:19 -07:00
Aravind Akella
ef89f7638c
am cf818ebb
: Merge "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors" into klp-modular-dev
...
* commit 'cf818ebbf07c6a20ef48d71bf82f8d4bdf3a398c':
Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors
2014-04-11 19:34:53 +00:00
Aravind Akella
cf818ebbf0
Merge "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors" into klp-modular-dev
2014-04-11 19:32:28 +00:00
Jeff Brown
974279d989
am db19e463
: Remove unnecessary policy flags.
...
* commit 'db19e463fe5a4e00a0214c564527ba67f31e1afb':
Remove unnecessary policy flags.
2014-04-11 03:53:32 +00:00
Aravind Akella
700180487f
Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors
...
This reverts commit 4369a4ebd5
.
Change-Id: Ifa8619cc6873470a07a987763d818d78d4232610
2014-04-11 00:06:06 +00:00
Jeff Brown
db19e463fe
Remove unnecessary policy flags.
...
Bug: 13133142
Change-Id: Ib6c63ebad25d84f78623b4a46ccf83953d235fe7
2014-04-09 17:04:44 -07:00
Etienne Le Grand
75b332037f
am 4369a4eb
: Revert "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors"
...
* commit '4369a4ebd5ae7567e7075bc82830b83178099ed5':
Revert "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors"
2014-04-05 09:06:00 +00:00
Etienne Le Grand
4369a4ebd5
Revert "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors"
...
This reverts commit c57a019e11
.
Change-Id: I3540565bc3e56a32cf3b176a29216cf68bb763b2
2014-04-05 05:02:22 +00:00
Etienne Le Grand
00f4dde1aa
am c57a019e
: Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors
...
* commit 'c57a019e117117c5a76c772970b26cd0f5db8c6a':
Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors
2014-04-05 01:52:28 +00:00
Etienne Le Grand
c57a019e11
Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors
...
Change-Id: If0f3dbdb5d2e9378e1fed4614baee4e750d0c850
2014-04-04 16:31:09 -07:00
John Spurlock
17251cd445
am ad98ad04
: Add ACONFIGURATION_UI_MODE_TYPE_WATCH to configuation enum.
...
* commit 'ad98ad0493625578f19c727576d02725b82f927c':
Add ACONFIGURATION_UI_MODE_TYPE_WATCH to configuation enum.
2014-04-04 19:28:07 +00:00
Greg Hackmann
3b1cb037ee
am 27f8840f
: Merge "make struct Event layout consistent on 32/64-bit"
...
* commit '27f8840f228abfe5e2458a261ce5403871495a54':
make struct Event layout consistent on 32/64-bit
2014-04-04 00:08:11 +00:00
John Spurlock
ad98ad0493
Add ACONFIGURATION_UI_MODE_TYPE_WATCH to configuation enum.
...
Bug:13395758
Change-Id: Iecdae299bfd030f86145d02fa7860374b5a40a74
2014-04-03 16:39:17 -04:00
Glenn Kasten
fb3bbd1df3
am d2f76332
: Merge "AArch64: Correction to OMX_U32 and OMX_S32"
...
* commit 'd2f7633277dd13ac269adb51c4e7a85746e6c599':
AArch64: Correction to OMX_U32 and OMX_S32
2014-04-03 17:14:50 +00:00
Greg Hackmann
27f8840f22
Merge "make struct Event layout consistent on 32/64-bit"
2014-04-03 17:07:09 +00:00
Glenn Kasten
d2f7633277
Merge "AArch64: Correction to OMX_U32 and OMX_S32"
2014-04-03 17:00:59 +00:00
Narayan Kamath
d09b2acdc8
am 033bdd72
: Merge "Remove global variables from ProcessState."
...
* commit '033bdd72f9f32f4bd3d282750bdc0dcfbb469959':
Remove global variables from ProcessState.
2014-04-03 14:11:31 +00:00
Narayan Kamath
162ea0e9e8
Remove global variables from ProcessState.
...
These weren't really being used and they make it
very hard to reason about who looks at command line
arguments.
Processes started via app_process (this includes all
zygote forks and the system_server) can get information
about command line arguments from the AndroidRuntime
class, which is available via a call to
AndroidRuntime::getRuntime.
bug: 13647418
Change-Id: I6f92680c3619a68c6d4b0995db4cdc9adc788e36
2014-04-03 12:29:44 +00:00
Marcus Oakland
849de60c1e
AArch64: Correction to OMX_U32 and OMX_S32
...
The types of OMX_U32 and OMX_S32 were appropriate to a 32-bit system
but were not appropriate to a 64-bit system. They have been changed to
make them portable between the two systems. With this change and a
change to frameworks/av/media/libstagefright/foundation/AString.cpp,
the android.media.cts.DecoderTest#testFlush CTS test passes.
Change-Id: I8e16c7169f54599c23fea71585b531e48541c78a
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
2014-04-02 11:20:01 -07:00
Jeff Tinker
b2f414fbd6
am 98e5bf2c
: Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev
...
* commit '98e5bf2cc0931fc4e4d88b3f64069bd200690be0':
Support CAST V2 Authentication in MediaDrm
2014-04-01 22:00:44 +00:00
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
6c4e2d816b
am 773585e6
: Merge "Generate ACTION_CANCEL on joystick disconnect. DO NOT MERGE" into klp-modular-dev
...
* commit '773585e60c2e6c3e39f9f56d0d3b05eeae6dff04':
Generate ACTION_CANCEL on joystick disconnect. DO NOT MERGE
2014-03-28 19:37:39 +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
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
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
446ef4bae2
am f0190bff
: Add support for writing byte arrays to parcels
...
* commit 'f0190bff38b6c29abbfc4a877442f71fc3d7dad8':
Add support for writing byte arrays to parcels
2014-03-14 23:32:45 +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
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
ffd353a73e
am d9e113f0
: b/12068020 add nonce to InputDeviceDescriptor. Do not merge
...
* commit 'd9e113f0e0feac1a801f8339d2f907302bd432c5':
b/12068020 add nonce to InputDeviceDescriptor. Do not merge
2014-03-12 21:12:28 +00: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
d0f7ce457c
am 9b04f860
: Add MAX_CONTROLLER_LEDS constant. DO NOT MERGE
...
* commit '9b04f860f23481d39c3b45379a324d3630966825':
Add MAX_CONTROLLER_LEDS constant. DO NOT MERGE
2014-03-11 23:22:00 +00:00
Michael Wright
9b04f860f2
Add MAX_CONTROLLER_LEDS constant. DO NOT MERGE
...
Change-Id: Ie6dbce926280c748f39e3c54d2ed4accbdcf9e59
2014-03-11 14:19:33 -07:00