summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge in mnc-release history after reset to mnc-devThe Android Automerger2015-07-130-0/+0
|\
| * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-07-010-0/+0
| |\
| | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-250-0/+0
| | |\
| | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-240-0/+0
| | | |\
| | | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-230-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
| |/ / / / / /
* | | | | | | Remove out-of-date camera2 native tests.Ruben Brunk2015-07-102-873/+0
|/ / / / / /
* | | | | | Fingerprint: Add post_enroll() API, adapt struct for binary compatibility, do...Sasha Levitskiy2015-06-261-35/+47
|/ / / / /
* | | | | Merge "Revert "Revert "Rename keymaster tag types to clarify that integers ar...Shawn Willden2015-06-241-30/+30
|\ \ \ \ \
| * | | | | Revert "Revert "Rename keymaster tag types to clarify that integers are unsig...Shawn Willden2015-06-241-30/+30
* | | | | | Merge "Revert "Rename keymaster tag types to clarify that integers are unsign...Shawn Willden2015-06-241-30/+30
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Revert "Rename keymaster tag types to clarify that integers are unsigned."Shawn Willden2015-06-241-30/+30
* | | | | | Merge "Rename keymaster tag types to clarify that integers are unsigned." int...Shawn Willden2015-06-241-30/+30
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Rename keymaster tag types to clarify that integers are unsigned.Shawn Willden2015-06-241-30/+30
| |/ / / /
* | | | | 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
* | | | | Merge "Define a flag for whether a sensor supports data_injection mode or not...Aravind Akella2015-06-231-8/+23
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Define a flag for whether a sensor supports data_injection mode or not.Aravind Akella2015-06-221-8/+23
| | |/ / | |/| |
* | | | 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
| |/ /
* | | Add new error codes for rate-limit and max-use failures.Shawn Willden2015-06-181-0/+2
* | | Update comments on now-unsed user ID and app ID tags.Shawn Willden2015-06-181-6/+4
* | | Remove KM_TAG_AEAD_TAG.Shawn Willden2015-06-181-5/+2
|/ /
* | 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
* | | Merge "Update USB channel mask handling" into mnc-devAndy Hung2015-06-121-2/+8
|\ \ \ | |_|/ |/| |
| * | Update USB channel mask handlingAndy Hung2015-06-101-2/+8
* | | Fingerprint: Avoid passing structures where simple types should suffice.Sasha Levitskiy2015-06-102-7/+7
| |/ |/|
* | 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
| |/
* | SAP: Make it possible to enforce a 16-digit pin code (2/5)Casper Bonde2015-06-092-1/+2
* | Fingerprint: Remove unused API elements.Sasha Levitskiy2015-06-082-28/+2
|/
* 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
* | gralloc: Sort usage flagsDan Stoza2015-06-031-17/+16
* | Fix extern "C" guards.Shawn Willden2015-06-031-2/+2
* | 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
* | | 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
* | | 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
* | | Add support for MITM for BluetoothSockets (3/4)Casper Bonde2015-06-031-2/+3
* | | 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
| | |/ | |/|
* | | SAP: Change to use new SDP Api (3/4)Casper Bonde2015-06-021-6/+12
|/ /
* | Merge "Pack AGpsStatus data structures for 64-bit platforms. b/21471818" into...destradaa2015-06-011-0/+8
|\ \ | |/ |/|