summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Define new wake_up sensors in sensors.h"Aravind Akella2014-04-242-7/+136
|\
| * Define new wake_up sensors in sensors.hAravind Akella2014-04-232-7/+136
| | | | | | | | | | | | | | | | | | i) Define WAKE_UP sensors. ii) Deprecate flags DRY_RUN and WAKE_UPON_FIFO_FULL. iii) Define maxDelay and isWakeUpSensor flag in sensor_t. Bug: 13251067 Change-Id: Ic474d90d05459b06e93094856423f6645b4bf58e
* | Merge "Hardware: Fingerprint: Fix the remove() argument, typos."Sasha Levitskiy2014-04-232-8/+8
|\ \
| * | Hardware: Fingerprint: Fix the remove() argument, typos.Sasha Levitskiy2014-04-232-8/+8
| | | | | | | | | | | | | | | Change-Id: I99e8e2f24f0264c2217d67a75fe437756596053c Signed-off-by: Sasha Levitskiy <sanek@google.com>
* | | Camera: HAL: 64-bit warning fixit.Sasha Levitskiy2014-04-237-74/+98
|/ / | | | | | | | | Change-Id: Iecc3e1846fbf63c51952d115e1f167cf32135b18 Signed-off-by: Sasha Levitskiy <sanek@google.com>
* | Merge "Hardware: Fingerprint: Move the HAL to an async model, add some ↵Sasha Levitskiy2014-04-223-47/+79
|\ \ | |/ |/| | | vendor requested functionality."
| * Hardware: Fingerprint: Move the HAL to an async model, add some vendor ↵Sasha Levitskiy2014-04-223-47/+79
| | | | | | | | | | | | | | requested functionality. Change-Id: Ib99e3edb99579ac4495918eb57d1022d75dccb57 Signed-off-by: Sasha Levitskiy <sanek@google.com>
* | Camera2: Tests: 64-bit warning fixitSasha Levitskiy2014-04-212-14/+16
| | | | | | | | | | Change-Id: Idb761d2bfd8f07838a194f986f7c0a06429f4049 Signed-off-by: Sasha Levitskiy <sanek@google.com>
* | am 6322562d: am c070bad4: Merge changes I672d4ee8,I6a2183b5,If0c0135eColin Cross2014-04-214-10/+11
|\ \ | |/ |/| | | | | | | | | * commit '6322562d0f1387c08109f706f381a3818114f91f': usbaudio: allow compiling for 64-bit audio_remote_submix: allow compiling for 64-bit audio: allow compiling for 64-bit
| * am c070bad4: Merge changes I672d4ee8,I6a2183b5,If0c0135eColin Cross2014-04-214-10/+11
| |\ | | | | | | | | | | | | | | | | | | * commit 'c070bad435799b4febdd2acf6be6c191f15f724e': usbaudio: allow compiling for 64-bit audio_remote_submix: allow compiling for 64-bit audio: allow compiling for 64-bit
| | * Merge changes I672d4ee8,I6a2183b5,If0c0135eColin Cross2014-04-194-10/+11
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | * changes: usbaudio: allow compiling for 64-bit audio_remote_submix: allow compiling for 64-bit audio: allow compiling for 64-bit
| | | * usbaudio: allow compiling for 64-bitColin Cross2014-04-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set -Wno-unused-parameter, which makes the directory warnings-clean on 32-bit and 64-bit. Remove LOCAL_32_BIT_ONLY. Change-Id: I672d4ee8d9e70c75f9376ca60389af08f73166b8
| | | * audio_remote_submix: allow compiling for 64-bitColin Cross2014-04-182-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a few 64-bit warnings and set -Wno-unused-parameter, which makes the directory warnings-clean on 32-bit and 64-bit. Remove LOCAL_32_BIT_ONLY. Change-Id: I6a2183b5bb0cdf438a04de967995da7b1e2e3854
| | | * audio: allow compiling for 64-bitColin Cross2014-04-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set -Wno-unused-parameter, which makes the directory warnings-clean on 32-bit and 64-bit. Remove LOCAL_32_BIT_ONLY. Change-Id: If0c0135e57935d785a0f36b7d5187ac567c7e21c
* | | | am 2131c7c5: am cb3a62ea: Merge "keymaster: add flags indicating feature ↵Kenny Root2014-04-180-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | support" * commit '2131c7c5999c2b32b8eedc888cad194f26442b8b': keymaster: add flags indicating feature support
| * | | am cb3a62ea: Merge "keymaster: add flags indicating feature support"Kenny Root2014-04-181-2/+29
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'cb3a62ea2f9a08dbe83ff68685f6361a5d015345': keymaster: add flags indicating feature support
| | * | Merge "keymaster: add flags indicating feature support"Kenny Root2014-04-181-2/+29
| | |\ \ | | | |/ | | |/|
| | | * keymaster: add flags indicating feature supportKenny Root2013-10-251-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For wrapping the disk encryption secret, we add a flag that indicates it can be done without having to start some storage daemon which the trusted OS will query to get data needed to load up the keys. This usually means that the "key blob" we store is actually just the RSA key encrypted with the device's KEK and not a reference to an encrypted filesystem stored on /data Also to allow other providers to upgrade to V3 of the header, we add flags to show whether the keymaster supports different key types. This allows keymaster HALs to support the whole device encryption secret wrapping without needing to implement DSA and EC key handling. The V2 header made support implicit. Change-Id: Ic5b13e2e84dd91e7a4ae443048ecc16cc805cb97
* | | | keymaster: add flags indicating feature supportKenny Root2014-04-181-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For wrapping the disk encryption secret, we add a flag that indicates it can be done without having to start some storage daemon which the trusted OS will query to get data needed to load up the keys. This usually means that the "key blob" we store is actually just the RSA key encrypted with the device's KEK and not a reference to an encrypted filesystem stored on /data Also to allow other providers to upgrade to V3 of the header, we add flags to show whether the keymaster supports different key types. This allows keymaster HALs to support the whole device encryption secret wrapping without needing to implement DSA and EC key handling. The V2 header made support implicit. (cherry picked from commit 8a3849e26f9c64314edb69586819250e8f95c1eb) Change-Id: I49be8403faf9f4c3888c84848b3009b44ab6d183
* | | | am dbcec633: am dd6e1a01: Merge "Reduced most MultiHal ALOGI to ALOGV, ↵Aaron Whyte2014-04-161-7/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | reducing bootup logspam." into klp-modular-dev * commit 'dbcec633d3d9e7e63f287e39c691439424a9c288': Reduced most MultiHal ALOGI to ALOGV, reducing bootup logspam.
| * | | am dd6e1a01: Merge "Reduced most MultiHal ALOGI to ALOGV, reducing bootup ↵Aaron Whyte2014-04-161-7/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | logspam." into klp-modular-dev * commit 'dd6e1a018e318d8f95d507a2b7fc54eaa0fcabf5': Reduced most MultiHal ALOGI to ALOGV, reducing bootup logspam.
| | * \ \ Merge "Reduced most MultiHal ALOGI to ALOGV, reducing bootup logspam." into ↵Aaron Whyte2014-04-161-7/+7
| | |\ \ \ | | | | | | | | | | | | | | | | | | klp-modular-dev
| | | * | | Reduced most MultiHal ALOGI to ALOGV, reducing bootup logspam.Aaron Whyte2014-04-151-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14084750 Change-Id: I099aaaa24caf0213af373b5a600616674349ff95
* | | | | | am 311c8922: (-s ours) am 40208a8b: DO NOT MERGE Fix PAN control callback ↵Ariel Gertzenstein2014-04-160-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | definition to match what bluedroid is doing. * commit '311c8922d7b9268b649eea4d6f578f3c65cab468': DO NOT MERGE Fix PAN control callback definition to match what bluedroid is doing.
| * | | | | am 40208a8b: DO NOT MERGE Fix PAN control callback definition to match ↵Ariel Gertzenstein2014-04-160-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | what bluedroid is doing. * commit '40208a8b2baf9629c12966e52f2f901b3019670c': DO NOT MERGE Fix PAN control callback definition to match what bluedroid is doing.
| | * | | | DO NOT MERGE Fix PAN control callback definition to match what bluedroid ↵Ariel Gertzenstein2014-04-161-2/+2
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is doing. There's a discrepancy in the order of arguments between the interface and the implementation. bluedroid swaps the |error| and |local_role| arguments when calling back so this change redefines the interface for consistency. http://b/12853951 Change-Id: I0ccfc6d6d2002d647d484ab7f53744863b569502
* | | | | am da38fb2d: am 4d7ac52d: Fixed multihal handling of nonexistent sensor handles.Aaron Whyte2014-04-151-17/+65
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'da38fb2d13ceeee79a39146ca30e720e58572989': Fixed multihal handling of nonexistent sensor handles.
| * | | | am 4d7ac52d: Fixed multihal handling of nonexistent sensor handles.Aaron Whyte2014-04-151-17/+65
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '4d7ac52d75b725ff25d68416747bfd43bbbc065d': Fixed multihal handling of nonexistent sensor handles.
| | * | | Fixed multihal handling of nonexistent sensor handles.Aaron Whyte2014-04-151-17/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents crashes and undefined behavior when someone calls sensor HAL methods with nonexistent handles. It also adds checks and warnings if bad sensor HALs provide garbage sensor handles in their sensor events. Tested by making sure pedometer and tilt still work. Bug: 13513595 Change-Id: Ie1489d3f2972bec82ee1c73189e532f6658d1eca
* | | | | Merge "Remove offset checks for reserved fields in sensor_t and ↵Aravind Akella2014-04-111-2/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | sensors_event_t."
| * | | | | Remove offset checks for reserved fields in sensor_t and sensors_event_t.Aravind Akella2014-04-111-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ea676f9ae6757018110532f424fa15df6704be0e. Change-Id: I4c69b46f20fa3505e062363643711991e65d6cb4
* | | | | | Merge "Add heart rate monitor, stringType and requiredPermissions to sensors.h"Aravind Akella2014-04-111-4/+99
|\ \ \ \ \ \
| * | | | | | Add heart rate monitor, stringType and requiredPermissions to sensors.hAravind Akella2014-04-101-4/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merged and resolved conflicts with Ic66b792c8229867fa5ff760cdde3d7c6f3360296 Conflicts: include/hardware/sensors.h Change-Id: I47b7e5f16b50fd5272590f6daba4a9d6833b3afb
* | | | | | | am 7e027537: (-s ours) am d5b3c73d: Merge "DO NOT MERGE Add heart rate ↵Aravind Akella2014-04-110-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | monitor, stringType and requiredPermissions to sensors.h" into klp-modular-dev * commit '7e02753740b3be3f7100b461e628ce2f0c1823f4': DO NOT MERGE Add heart rate monitor, stringType and requiredPermissions to sensors.h
| * | | | | | am d5b3c73d: Merge "DO NOT MERGE Add heart rate monitor, stringType and ↵Aravind Akella2014-04-111-4/+99
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | requiredPermissions to sensors.h" into klp-modular-dev * commit 'd5b3c73d80ec851296037d2c7ed011ac306eb2f5': DO NOT MERGE Add heart rate monitor, stringType and requiredPermissions to sensors.h
| | * | | | | Merge "DO NOT MERGE Add heart rate monitor, stringType and ↵Aravind Akella2014-04-111-4/+99
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | requiredPermissions to sensors.h" into klp-modular-dev
| | | * | | | | DO NOT MERGE Add heart rate monitor, stringType and requiredPermissions to ↵Aravind Akella2014-04-081-4/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sensors.h This reverts commit d27d819897dcae794d26d604c2334a76ef8b9558. Change-Id: Ic66b792c8229867fa5ff760cdde3d7c6f3360296
* | | | | | | | Merge "tv_input: add buffer producer profile"Wonsik Kim2014-04-112-7/+108
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | tv_input: add buffer producer profileWonsik Kim2014-04-092-7/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id86e282a06d6353f05d47a2f198bde0534d9dcf2
* | | | | | | | Camera2 test: fix build break due to change in camera service.Jianing Wei2014-04-103-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If8785df9209c83ccd1454b89b46d5e885f897cae
* | | | | | | | Merge "Remove deprecated BufferQueue constructor"Dan Stoza2014-04-083-15/+25
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Remove deprecated BufferQueue constructorDan Stoza2014-04-073-15/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13415624 Change-Id: Ia2ed4b5bc7289f8d8ab6e6a431746b43c81842bc
* | | | | | | | Hardware: Fingerprint: Add current version.Sasha Levitskiy2014-04-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8025276da558d1bf07735cd9d71ba1586566dd07 Signed-off-by: Sasha Levitskiy <sanek@google.com>
* | | | | | | | Hardware: Fingerprint: Introducing Fingerprint HALSasha Levitskiy2014-04-077-1/+332
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4e55c42841c3b6a1327a16bdf6d1d4bb3847c7f3 Signed-off-by: Sasha Levitskiy <sanek@google.com>
* | | | | | | am e6bee250: (-s ours) am 71a50543: Merge "Revert "Add heart rate monitor, ↵Etienne Le Grand2014-04-050-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stringType and requiredPermissions to sensors.h"" into klp-modular-dev * commit 'e6bee250643159b835dd23f6837e360f4282d615': Revert "Add heart rate monitor, stringType and requiredPermissions to sensors.h"
| * | | | | | am 71a50543: Merge "Revert "Add heart rate monitor, stringType and ↵Etienne Le Grand2014-04-051-99/+4
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | requiredPermissions to sensors.h"" into klp-modular-dev * commit '71a50543134b56055ab5be1262495bc3c7ec0c74': Revert "Add heart rate monitor, stringType and requiredPermissions to sensors.h"
| | * | | | | Merge "Revert "Add heart rate monitor, stringType and requiredPermissions to ↵Etienne Le Grand2014-04-051-99/+4
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | sensors.h"" into klp-modular-dev
| | | * | | | Revert "Add heart rate monitor, stringType and requiredPermissions to sensors.h"Etienne Le Grand2014-04-051-99/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0b8ec4f71fa31cd6db33da5fefcebf2ecb6b6d7a. Change-Id: I99051b6941cad570aef45ff568d1777f881fc33b
* | | | | | | am 66fad0e3: (-s ours) am 61c78d98: Merge "Add heart rate monitor, ↵Etienne Le Grand2014-04-050-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stringType and requiredPermissions to sensors.h" into klp-modular-dev * commit '66fad0e3e7db1ca02fa0af968008ed02e47c593c': Add heart rate monitor, stringType and requiredPermissions to sensors.h
| * | | | | | am 61c78d98: Merge "Add heart rate monitor, stringType and ↵Etienne Le Grand2014-04-051-4/+99
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | requiredPermissions to sensors.h" into klp-modular-dev * commit '61c78d9804625ea2ec56c855602682aaa7dd5a75': Add heart rate monitor, stringType and requiredPermissions to sensors.h
generated by cgit v1.1 at 2025-01-23 15:50:29 +0000