summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | Revert "Add stringType and requiredPermission to sensors, effectively adding ↵Etienne Le Grand2014-04-052-28/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | permission checking for sensors" This reverts commit c57a019e117117c5a76c772970b26cd0f5db8c6a. Change-Id: I3540565bc3e56a32cf3b176a29216cf68bb763b2
* | | | | | | | | Merge "Adding render stats APIs to UiAutomation (framework native)."Svetoslav2014-04-105-3/+106
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Adding render stats APIs to UiAutomation (framework native).Svetoslav2014-04-105-3/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:12927198 Change-Id: Ibb1c07f7d89e11281e5c1f27f412a29ac6f9c4ab
* | | | | | | | | BufferQueue: Remove Bn version of create*Dan Stoza2014-04-071-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that there's no reason to have both I* and Bn* versions of the createBufferQueue method, so I removed the Bn* version. Change-Id: I66aeb09e10458ae540ddf1f38d2d0154ea8f315b
* | | | | | | | | Revert "Add stringType and requiredPermission to sensors, effectively adding ↵Etienne Le Grand2014-04-052-28/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | permission checking for sensors" This reverts commit c57a019e117117c5a76c772970b26cd0f5db8c6a. Change-Id: I3540565bc3e56a32cf3b176a29216cf68bb763b2 (cherry picked from commit 4369a4ebd5ae7567e7075bc82830b83178099ed5)
* | | | | | | | | am 00f4dde1: am c57a019e: Add stringType and requiredPermission to sensors, ↵Etienne Le Grand2014-04-052-0/+28
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | effectively adding permission checking for sensors * commit '00f4dde1aa88576811bca79bc8242e1fc1edb333': Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors
| * | | | | | | | am c57a019e: Add stringType and requiredPermission to sensors, effectively ↵Etienne Le Grand2014-04-052-0/+28
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adding permission checking for sensors * commit 'c57a019e117117c5a76c772970b26cd0f5db8c6a': Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors
| | * | | | | | | Add stringType and requiredPermission to sensors, effectively adding ↵Etienne Le Grand2014-04-042-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | permission checking for sensors Change-Id: If0f3dbdb5d2e9378e1fed4614baee4e750d0c850
* | | | | | | | | am 17251cd4: am ad98ad04: Add ACONFIGURATION_UI_MODE_TYPE_WATCH to ↵John Spurlock2014-04-041-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configuation enum. * commit '17251cd445cf80cfb6085a1b0b317cd85ad5be00': Add ACONFIGURATION_UI_MODE_TYPE_WATCH to configuation enum.
| * | | | | | | | am ad98ad04: Add ACONFIGURATION_UI_MODE_TYPE_WATCH to configuation enum.John Spurlock2014-04-041-0/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ad98ad0493625578f19c727576d02725b82f927c': Add ACONFIGURATION_UI_MODE_TYPE_WATCH to configuation enum.
| | * | | | | | | Add ACONFIGURATION_UI_MODE_TYPE_WATCH to configuation enum.John Spurlock2014-04-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:13395758 Change-Id: Iecdae299bfd030f86145d02fa7860374b5a40a74
* | | | | | | | | am 3b1cb037: am 27f8840f: Merge "make struct Event layout consistent on ↵Greg Hackmann2014-04-041-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | / / / / / / | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | 32/64-bit" * commit '3b1cb037eea56dba0d134c6858f8ddc0f9743ff8': make struct Event layout consistent on 32/64-bit
| * | | | | | | am 27f8840f: Merge "make struct Event layout consistent on 32/64-bit"Greg Hackmann2014-04-041-1/+1
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '27f8840f228abfe5e2458a261ce5403871495a54': make struct Event layout consistent on 32/64-bit
| | * | | | | | Merge "make struct Event layout consistent on 32/64-bit"Greg Hackmann2014-04-031-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | make struct Event layout consistent on 32/64-bitFengwei Yin2014-03-201-1/+1
| | | | |_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | am fb3bbd1d: am d2f76332: Merge "AArch64: Correction to OMX_U32 and OMX_S32"Glenn Kasten2014-04-031-2/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fb3bbd1df323c24dc10c095f29ee8010fc3d1df0': AArch64: Correction to OMX_U32 and OMX_S32
| * | | | | | | am d2f76332: Merge "AArch64: Correction to OMX_U32 and OMX_S32"Glenn Kasten2014-04-031-2/+4
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd2f7633277dd13ac269adb51c4e7a85746e6c599': AArch64: Correction to OMX_U32 and OMX_S32
| | * | | | | | Merge "AArch64: Correction to OMX_U32 and OMX_S32"Glenn Kasten2014-04-031-2/+4
| | |\ \ \ \ \ \
| | | * | | | | | AArch64: Correction to OMX_U32 and OMX_S32Marcus Oakland2014-04-021-2/+4
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | am d09b2acd: am 033bdd72: Merge "Remove global variables from ProcessState."Narayan Kamath2014-04-031-11/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd09b2acdc8ca706c65984956e61c0bb333cee992': Remove global variables from ProcessState.
| * | | | | | | am 033bdd72: Merge "Remove global variables from ProcessState."Narayan Kamath2014-04-031-11/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '033bdd72f9f32f4bd3d282750bdc0dcfbb469959': Remove global variables from ProcessState.
| | * | | | | | Remove global variables from ProcessState.Narayan Kamath2014-04-031-11/+0
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | PowerManager: add powerHint binder methodRuchi Kandoi2014-04-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ide1d50bb1580698b25296fbfc1cc63c3b21a00bc
* | | | | | | am b2f414fb: am 98e5bf2c: Merge "Support CAST V2 Authentication in MediaDrm" ↵Jeff Tinker2014-04-011-2/+15
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | | | | | | | | | | | | | | into klp-modular-dev * commit 'b2f414fbd6e3be45bbea28d84db3ce9712ddcd5b': Support CAST V2 Authentication in MediaDrm
| * | | | | am 98e5bf2c: Merge "Support CAST V2 Authentication in MediaDrm" into ↵Jeff Tinker2014-04-011-2/+15
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit '98e5bf2cc0931fc4e4d88b3f64069bd200690be0': Support CAST V2 Authentication in MediaDrm
| | * | | | Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-devJeff Tinker2014-04-011-2/+15
| | |\ \ \ \
| | | * | | | Support CAST V2 Authentication in MediaDrmJeff Tinker2014-03-291-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update frameworks to enable support for CAST V2 Authentication in the DRM Plugin. Change-Id: Ic38f0e1484b1388dd87f4591c74984cb724d50e2 related-to-bug: 12702350
| * | | | | | am 773585e6: Merge "Generate ACTION_CANCEL on joystick disconnect. DO NOT ↵Michael Wright2014-03-281-3/+8
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE" into klp-modular-dev * commit '773585e60c2e6c3e39f9f56d0d3b05eeae6dff04': Generate ACTION_CANCEL on joystick disconnect. DO NOT MERGE
| | * | | | | Generate ACTION_CANCEL on joystick disconnect. DO NOT MERGEMichael Wright2014-03-241-3/+8
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11480300 Change-Id: I5a4096970c9e588d134f05dd0eb3a9c91c836b2f
* | | | | | Merge "Allow creation of heaps that are read-only to partner"Glenn Kasten2014-03-271-1/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Allow creation of heaps that are read-only to partnerGlenn Kasten2014-03-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3c2b3d9b1671da4b9d9c58dce27e291d30703b03
* | | | | | Merge "batteryservice: Add battery capacity"Paul Lawrence2014-03-201-0/+1
|\ \ \ \ \ \
| * | | | | | batteryservice: Add battery capacityPaul Lawrence2014-03-191-0/+1
| |/ / / / / | | | | | | | | | | | | Change-Id: I6879ec9ec931cbea82aa550b3b227e744255bfd4
* | | | | | Generate ACTION_CANCEL on joystick disconnect.Michael Wright2014-03-201-3/+8
|/ / / / / | | | | | | | | | | | | | | | | | | | | Bug: 11480300 Change-Id: I46706838eec0711c6bf345301e7b4ccbad83b063
* | | | | Merge "BufferItemConsumer: Use IGBC instead of BQ"Dan Stoza2014-03-181-3/+3
|\ \ \ \ \
| * | | | | BufferItemConsumer: Use IGBC instead of BQDan Stoza2014-03-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id1756ac62954ba412f2c23c5fa6e5d760c299347
* | | | | | Merge "Remove deprecated BufferQueue constructor"Dan Stoza2014-03-181-1/+1
|\ \ \ \ \ \
| * | | | | | Remove deprecated BufferQueue constructorDan Stoza2014-03-131-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13415624 Change-Id: I52f58a4d22296d9fc3cdbd4ad53eb10a785db3ce
* | | | | | Merge "Revert "Implement video plane layer""Wonsik Kim2014-03-181-1/+0
|\ \ \ \ \ \
| * | | | | | Revert "Implement video plane layer"Wonsik Kim2014-03-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f837c93a1b392dbc4f7099d0c4fb723e32ca438e. Change-Id: I6a1aa9ad0aca023267dc53d19c950b1535123ca7
* | | | | | | am 793be12c: am b730a452: am f0190bff: Add support for writing byte arrays ↵Marco Nelissen2014-03-151-0/+1
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to parcels * commit '793be12c0f5a7878d1085e94e58a9c36c84f0911': Add support for writing byte arrays to parcels
| * | | | | | am b730a452: am f0190bff: Add support for writing byte arrays to parcelsMarco Nelissen2014-03-141-0/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | * commit 'b730a45216991cf22c39451c47393b4bccae111b': Add support for writing byte arrays to parcels
| | * | | | | am f0190bff: Add support for writing byte arrays to parcelsMarco Nelissen2014-03-141-0/+1
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | * commit 'f0190bff38b6c29abbfc4a877442f71fc3d7dad8': Add support for writing byte arrays to parcels
| | | * | | | Add support for writing byte arrays to parcelsMarco Nelissen2014-03-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/13418320 Change-Id: I2285df9e9d3dc8a6a54055b13b352b81660bf45d
| * | | | | | am d9e113f0: b/12068020 add nonce to InputDeviceDescriptor. Do not mergeRoboErik2014-03-121-0/+5
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'd9e113f0e0feac1a801f8339d2f907302bd432c5': b/12068020 add nonce to InputDeviceDescriptor. Do not merge
| | * | | | | b/12068020 add nonce to InputDeviceDescriptor. Do not mergeRoboErik2014-03-121-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | am 9b04f860: Add MAX_CONTROLLER_LEDS constant. DO NOT MERGEMichael Wright2014-03-111-0/+3
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '9b04f860f23481d39c3b45379a324d3630966825': Add MAX_CONTROLLER_LEDS constant. DO NOT MERGE
| | * | | | | Add MAX_CONTROLLER_LEDS constant. DO NOT MERGEMichael Wright2014-03-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie6dbce926280c748f39e3c54d2ed4accbdcf9e59
* | | | | | | Merge "Add sideband streams to BufferQueue and related classes"Jesse Hall2014-03-139-5/+79
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Add sideband streams to BufferQueue and related classesJesse Hall2014-03-119-5/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sideband streams are essentially a device-specific buffer queue that bypasses the BufferQueue system. They can be used for situations with hard real-time requirements like high-quality TV and video playback with A/V sync. A handle to the stream is provided by the source HAL, and attached to a BufferQueue. The sink HAL can read buffers via the stream handle rather than acquiring individual buffers from the BufferQueue. Change-Id: Ib3f262eddfc520f4bbe3d9b91753ed7dd09d3a9b