summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 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
* | | 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 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 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
* | | | 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
* | | | | 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 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
| * | | | Merge "Add heart rate monitor, stringType and requiredPermissions to ↵Etienne Le Grand2014-04-051-4/+99
| |\ \ \ \ | | |/ / / | | | | | | | | | | sensors.h" into klp-modular-dev
| | * | | Add heart rate monitor, stringType and requiredPermissions to sensors.hEtienne Le Grand2014-04-031-4/+99
| | | | | | | | | | | | | | | | | | | | Change-Id: I376e4dbb13d64f4987d4a8be82afddb625eefa54
* | | | | am 925855b5: Merge "LE: Add API to configure MTU for a given connection ↵Zhihai Xu2014-03-311-0/+7
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | (1/4)" into klp-modular-dev * commit '925855b5de013cb709fb2d88d840f9c6e71cdcf6': LE: Add API to configure MTU for a given connection (1/4)
| * | | | Merge "LE: Add API to configure MTU for a given connection (1/4)" into ↵Zhihai Xu2014-03-311-0/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | klp-modular-dev
| | * | | | LE: Add API to configure MTU for a given connection (1/4)Andre Eisenbach2014-03-251-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:13571470 Change-Id: Ia473998b714c3968c75565adeef20fef5656abb4
* | | | | | am 3bc29d3e: Merge "Added message_abort and operand enums" into klp-modular-devJinsuk Kim2014-03-311-7/+22
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '3bc29d3e0a08bee19a43a61ce77b1b86a1cda436': Added message_abort and operand enums
| * | | | | Merge "Added message_abort and operand enums" into klp-modular-devJinsuk Kim2014-03-311-7/+22
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Added message_abort and operand enumsJinsuk Kim2014-03-241-7/+22
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also clarfieid the method description (allocate_logical_address), update method signatures to use more appropriate type. Change-Id: Ie5d13969308e77ca19b3dbde682ca968337ab41b
* | | | | am 37de84bc: Merge "Camera2 Test: fix test criteria for exposure time"Eino-Ville Talvala2014-03-291-6/+9
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * commit '37de84bc96f808601897bcd126b73fc839fd2c20': Camera2 Test: fix test criteria for exposure time
| * | | | Merge "Camera2 Test: fix test criteria for exposure time"Eino-Ville Talvala2014-03-291-6/+9
| |\ \ \ \
| | * | | | Camera2 Test: fix test criteria for exposure timeGaurav Batra2014-03-281-6/+9
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Add some tolerance while testing requested exposure times against capture times. Change-Id: I609e7819cde8ee466e152775781a6542e6686ded
* | | | | am 93bf9964: Fix sensor multi hal crash when sub-HAL reports an errorNick Vaccaro2014-03-251-2/+5
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit '93bf99647b0d33dfe12deecef828b6bcb568cafe': Fix sensor multi hal crash when sub-HAL reports an error
| * | | | Fix sensor multi hal crash when sub-HAL reports an errorNick Vaccaro2014-03-171-2/+5
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Fix a null pointer dereference bug that caused the multihal to crash in an endless loop continuously trying to open a sensor HAL when it reports back an error. Change-Id: I6d82e8fdd9acde53f378a5fb3dfdb02c39d7b433
* | | | am 5106ad0c: Merge "Audio HALs are 32-bit only"Glenn Kasten2014-03-133-0/+4
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '5106ad0c6e664a622d177d997d3ec7147ef1ae8f': Audio HALs are 32-bit only
| * | | Merge "Audio HALs are 32-bit only"Glenn Kasten2014-03-133-0/+4
| |\ \ \
| | * | | Audio HALs are 32-bit onlyGlenn Kasten2014-03-133-0/+4
| |/ / / | | | | | | | | | | | | Change-Id: I97eef87849312610d82bc3f82e168bb40604e646
* | | | am 98add895: Add \'get_logical_address\' in HDMI-CEC HAL interfaceJinsuk Kim2014-03-111-1/+16
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '98add8956b1a346425df40d2f70a9ca33500f01c': Add 'get_logical_address' in HDMI-CEC HAL interface
| * | | Add 'get_logical_address' in HDMI-CEC HAL interfaceJinsuk Kim2014-03-111-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The new function allows the HDMI-CEC service to get the logical address updated by HAL implementation. Change-Id: I1a4c5f7b7773279091d5bd7c6971a8c9090a81ca
* | | | am 355e5d68: Merge "[HDMI-CEC] Modify the signature of ↵Jinsuk Kim2014-03-111-4/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | register_event_callback" into klp-modular-dev * commit '355e5d68021b272f692e5aa26f21fb4da57b3b93': [HDMI-CEC] Modify the signature of register_event_callback
| * | | Merge "[HDMI-CEC] Modify the signature of register_event_callback" into ↵Jinsuk Kim2014-03-111-4/+6
| |\ \ \ | | | | | | | | | | | | | | | klp-modular-dev
| | * | | [HDMI-CEC] Modify the signature of register_event_callbackJinsuk Kim2014-03-081-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additional parameter helps the caller avoid managing a static instance variable. The parameter is used to pass the caller object itself. Change-Id: I06cbcc7736031678f4638a0b5082d7b6a7ea51b6
* | | | | am 5d082f18: Merge "Fix PAN control callback definition to match what ↵Matthew Xie2014-03-101-2/+2
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | bluedroid is doing." * commit '5d082f1826cd5b72cd2a0eb0116c8a613d7555dd': Fix PAN control callback definition to match what bluedroid is doing.
| * | | | Merge "Fix PAN control callback definition to match what bluedroid is doing."Matthew Xie2014-03-101-2/+2
| |\ \ \ \
| | * | | | Fix PAN control callback definition to match what bluedroid is doing.Sharvil Nanavati2014-02-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 fc9be0a2: am 56910cf5: (-s ours) Merge "DO NOT MERGE BLE peripheral mode ↵Wei Wang2014-03-080-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | (1/4): change HAL to support service data and service uuids." into klp-dev * commit 'fc9be0a2438fca7bd7e961a86fd8d17f14b52623': DO NOT MERGE BLE peripheral mode (1/4): change HAL to support service data and service uuids.
| * | | | | am 56910cf5: (-s ours) Merge "DO NOT MERGE BLE peripheral mode (1/4): change ↵Wei Wang2014-03-080-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HAL to support service data and service uuids." into klp-dev * commit '56910cf52332219c6a23bc12596b261c127d93bf': DO NOT MERGE BLE peripheral mode (1/4): change HAL to support service data and service uuids.
| | * \ \ \ \ Merge "DO NOT MERGE BLE peripheral mode (1/4): change HAL to support service ↵Wei Wang2014-03-081-1/+3
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | data and service uuids." into klp-dev
| | | * | | | | DO NOT MERGE BLE peripheral mode (1/4): change HAL to support service data ↵Wei Wang2014-03-071-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and service uuids. Cherry picking ble advertising changes from master to KLP MR2. b/13137996 Change-Id: I19a3755a4ed16e1ae03368cecee97773c05c1770
generated by cgit v1.1 at 2025-02-09 09:27:42 +0000