summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-140-0/+0
|\
| * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-060-0/+0
| |\
| | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-160-0/+0
| | |\
| | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-150-0/+0
| | | |\ | | | |/ | | |/|
* | | | Merge "Camera2 tests: Fix incorrect error code check" into mnc-devEino-Ville Talvala2015-07-111-1/+1
|\ \ \ \
| * | | | Camera2 tests: Fix incorrect error code checkEino-Ville Talvala2015-07-101-1/+1
| |/ / / | | | | | | | | | | | | | | | | Bug: 22410279 Change-Id: Iad74e90d148908aafd39878608c10fe03c689b8a
* | | | Remove out-of-date camera2 native tests.Ruben Brunk2015-07-102-873/+0
|/ / / | | | | | | | | | | | | Bug: 22410279 Change-Id: Ib4a39306115e05b8e430bdc8456ad940b3426a8e
* | | Fingerprint: Add post_enroll() API, adapt struct for binary compatibility, ↵Sasha Levitskiy2015-06-261-35/+47
| | | | | | | | | | | | | | | | | | | | | doc change. Change-Id: If7e5738f921b0e91e46efc813d9f3c4bd1502832 Signed-off-by: Sasha Levitskiy <sanek@google.com>
* | | Merge "Revert "Revert "Rename keymaster tag types to clarify that integers ↵Shawn Willden2015-06-241-30/+30
|\ \ \ | | | | | | | | | | | | are unsigned.""" into mnc-dev
| * | | Revert "Revert "Rename keymaster tag types to clarify that integers are ↵Shawn Willden2015-06-241-30/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unsigned."" This reverts commit 1fb6c227deb04b66dc0fe947a7ebb027dde0ecda. Change-Id: Iccc8a7ff40a694b1e4420a5de4b847e62289ff42
* | | | Merge "Revert "Rename keymaster tag types to clarify that integers are ↵Shawn Willden2015-06-241-30/+30
|\ \ \ \ | |/ / / | | | | | | | | unsigned."" into mnc-dev
| * | | Revert "Rename keymaster tag types to clarify that integers are unsigned."Shawn Willden2015-06-241-30/+30
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 335920edaec77b77eac09f7966c337cbed93aa17. Change-Id: Ib65f744b93ad2b62d5848dcf743397124a08911b
* | | | Merge "Rename keymaster tag types to clarify that integers are unsigned." ↵Shawn Willden2015-06-241-30/+30
|\ \ \ \ | |/ / / | | | | | | | | into mnc-dev
| * | | Rename keymaster tag types to clarify that integers are unsigned.Shawn Willden2015-06-241-30/+30
| | | | | | | | | | | | | | | | | | | | Bug: 22008538 Change-Id: I699a0f03aaf0f9f49a78b310763364fc2fb34c90
* | | | Merge "hardware: gatekeeper: Add delete and delete_all api's" into mnc-devAndres Morales2015-06-241-0/+29
|\ \ \ \ | |/ / / |/| | |
| * | | hardware: gatekeeper: Add delete and delete_all api'sNaveen Ramaraj2015-06-231-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | Add delete and delete_all api for gatekeeper. Change-Id: I0511cb546ecba54b2a60692d6f704f24c55aa940
* | | | Merge "Define a flag for whether a sensor supports data_injection mode or ↵Aravind Akella2015-06-231-8/+23
|\ \ \ \ | | | | | | | | | | | | | | | not." into mnc-dev
| * | | | Define a flag for whether a sensor supports data_injection mode or not.Aravind Akella2015-06-221-8/+23
| | |/ / | |/| | | | | | | | | | Change-Id: I46373bbd2e10859b84428fe32b76679ac4292607
* | | | Merge "audio HAL: reverse mutex locking order" into mnc-devEric Laurent2015-06-231-26/+51
|\ \ \ \ | |_|/ / |/| | |
| * | | audio HAL: reverse mutex locking orderEric Laurent2015-06-191-26/+51
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not use main audio HAL mutex but a specific stream mutex when preventing control thread starvation by playback or capture threads. This will prevent systematic locking of main HAL mutex in read ot write and avoid glitches. Bug: 21880828. Bug: 18489202. Change-Id: I3054e0d93b823bd9d2fb84a49e9c5bbbe728262a
* | | Add new error codes for rate-limit and max-use failures.Shawn Willden2015-06-181-0/+2
| | | | | | | | | | | | | | | Bug: 21607106 Change-Id: I2e5515efe51b84200ade8c4c4cc5db3800d4b658
* | | Update comments on now-unsed user ID and app ID tags.Shawn Willden2015-06-181-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | I'd just remove them but Trusty keymaster has been generating keys with KM_TAG_ALL_USERS and KM_TAG_ALL_APPLICATIONS, so removing them without breaking those keys is tricky. Plus I think they may come back. Bug: 21845167 Change-Id: I3b807e3e4bee64eba72b7fa6f1ee1929c4ca9dd0
* | | Remove KM_TAG_AEAD_TAG.Shawn Willden2015-06-181-5/+2
|/ / | | | | | | | | Bug: 19919114 Change-Id: I06fdd0f9b8e247587d800031d3367078423baa50
* | Merge "Camera3: Document behavior of flush() corner cases." into mnc-devEino-Ville Talvala2015-06-121-0/+14
|\ \
| * | Camera3: Document behavior of flush() corner cases.Eino-Ville Talvala2015-06-101-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | Document how HAL should operate when process_capture_request is called while a flush() call is active. Bug: 21506384 Change-Id: Ic1842add68123432e49914e83d8f7d5c13d6650d
* | | Merge "Update USB channel mask handling" into mnc-devAndy Hung2015-06-121-2/+8
|\ \ \ | |_|/ |/| |
| * | Update USB channel mask handlingAndy Hung2015-06-101-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | 1 and 2 channels will default to mono and stereo n > 2 will default to channel index masks Bug: 16245854 Change-Id: I39f9d43385a93f48e323653fbde2e38a99b6256f
* | | Fingerprint: Avoid passing structures where simple types should suffice.Sasha Levitskiy2015-06-102-7/+7
| |/ |/| | | | | | | | | | | Bug: 21282699 Change-Id: I02e13b7da0ad361a95b981f9745aac039151f356 Signed-off-by: Sasha Levitskiy <sanek@google.com>
* | Merge "Camera2 tests: Update for framework changes" into mnc-devEino-Ville Talvala2015-06-092-13/+13
|\ \
| * | Camera2 tests: Update for framework changesEino-Ville Talvala2015-06-092-13/+13
| |/ | | | | | | Change-Id: I9ac788cfe9a001ef33bdc52a9e8ba0bdcf3ded2c
* | SAP: Make it possible to enforce a 16-digit pin code (2/5)Casper Bonde2015-06-092-1/+2
| | | | | | | | | | | | | | | | | | | | This change enable the posibility to enforce using a 16-digit pin or MITM for a RFCOMM or L2CAP connection. This is needed for the SIM access profile. Change-Id: I4d43eefa76e8abc1bcfad6dfd9004d8e82168bf4 Signed-off-by: Casper Bonde <c.bonde@samsung.com>
* | Fingerprint: Remove unused API elements.Sasha Levitskiy2015-06-082-28/+2
|/ | | | | Change-Id: Iba2f6a5bc7a2923c3e9b92684a2fab2190f14fd5 Signed-off-by: Sasha Levitskiy <sanek@google.com>
* Merge "Camera: Update for torch callbacks" into mnc-devChien-Yu Chen2015-06-031-10/+14
|\
| * Camera: Update for torch callbacksChien-Yu Chen2015-06-031-10/+14
| | | | | | | | | | | | | | | | | | | | Clarify that HAL shouldn't send AVAILABLE_OFF in addition to NOT_AVAILABLE when open() is called. Update the comments to use the right torch status enums. Bug: 21475390 Change-Id: If9adf4bd169048fc9760ef504d3a36414cfbb196
* | gralloc: Sort usage flagsDan Stoza2015-06-031-17/+16
| | | | | | | | | | | | | | | | Sorts the usage flags in increasing order so it's easier to see where the gaps are. Bug: 21609491 Change-Id: I98af3c67be84c6c5137767f3cd7a8bd63dfb5c03
* | Fix extern "C" guards.Shawn Willden2015-06-031-2/+2
| | | | | | | | Change-Id: Ibc8e023e3712903dbcbfac5fc64223e32775fe40
* | Merge "Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG" into mnc-devShawn Willden2015-06-031-6/+5
|\ \
| * | Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAGShawn Willden2015-06-021-6/+5
| | | | | | | | | | | | | | | Bug: 19919114 Change-Id: I384f3d2fee2f68279c6518d9ac0a79e29bed0e52
* | | Merge "Fix block mode numbering (CTR got added as 4 rather than 3)" into mnc-devShawn Willden2015-06-031-8/+3
|\ \ \ | |/ /
| * | Fix block mode numbering (CTR got added as 4 rather than 3)Shawn Willden2015-06-011-8/+3
| | | | | | | | | | | | Change-Id: I8c886c67ba081255ef18eb0f99ca1e6003fabb33
* | | Merge "Add output params to update() and finish()." into mnc-devShawn Willden2015-06-031-15/+16
|\ \ \ | |/ /
| * | Add output params to update() and finish().Shawn Willden2015-06-011-15/+16
| | | | | | | | | | | | | | | | | | | | | Also, change signatures of several methods to pass structs rather than array pointers and lengths. Change-Id: Iaa1be186ebbd444202c47926ab57ac65d57416d7
* | | Add support for MITM for BluetoothSockets (3/4)Casper Bonde2015-06-031-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds an option to enforce Man-in-the-middle protection for the authentication process. This feature is needed for the Sim Access Profile. Change-Id: I35d22a516ecbfc011ed13d7cb7d2ebda047fdfad Signed-off-by: Casper Bonde <c.bonde@samsung.com>
* | | Merge "libhardware: fix gralloc usage bit redefine" into mnc-devChong Zhang2015-06-031-1/+1
|\ \ \
| * | | libhardware: fix gralloc usage bit redefineChong Zhang2015-06-021-1/+1
| | |/ | |/| | | | | | | | | | bug: 21584171 Change-Id: I66c287681d3e53a263f85fbddfccbb199eaa4b33
* | | SAP: Change to use new SDP Api (3/4)Casper Bonde2015-06-021-6/+12
|/ / | | | | | | | | | | | | Added struct to carry SAP SDP record data. Change-Id: I511a8de39a6d750e3e94bee72f48b3356ce6cd02 Signed-off-by: Casper Bonde <c.bonde@samsung.com>
* | Merge "Pack AGpsStatus data structures for 64-bit platforms. b/21471818" ↵destradaa2015-06-011-0/+8
|\ \ | |/ |/| | | into mnc-dev
| * Pack AGpsStatus data structures for 64-bit platforms.destradaa2015-06-011-0/+8
| | | | | | | | | | | | | | | | | | b/21471818 The packing of AGpsStatus_v1 ensures that its size does not collide with the size of AGpsStatus_v2. Change-Id: Ic73a73070c29c0e819cb62667bc14333f448e856
* | Merge "Camera3: SHUTTER event for reprocessing" into mnc-devChien-Yu Chen2015-06-011-9/+17
|\ \
| * | Camera3: SHUTTER event for reprocessingChien-Yu Chen2015-06-011-9/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify that the SHUTTER event should be sent when HAL start processing a reprocess request but the timestamp should be the input image's start of exposure. Bug: 21112186 Change-Id: I5bd32b749adc5e82e9a311ec4b123fd807a30d36
generated by cgit v1.1 at 2024-06-12 15:51:00 +0000