summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Merge commit 'eab8a2ac417ba93bdfb09ddcb6095580a0cef0c4' into HEADThe Android Open Source Project2013-12-050-0/+0
| | |\
* | | | am 350fbb78: am 099a9d06: Merge commit ↵The Android Open Source Project2013-11-220-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | \'7d563651aa956c0f9831b7b64be35c2ec790bdec\' into HEAD * commit '350fbb7868a7f3ddc1fc84ff79f0793b8b530cd8':
| * | | am 099a9d06: Merge commit \'7d563651aa956c0f9831b7b64be35c2ec790bdec\' into HEADThe Android Open Source Project2013-11-220-0/+0
| |\| | | | |/ | |/| | | | * commit '099a9d06ec12006985a71133de289bdd92eb2f3b':
| | * Merge commit '7d563651aa956c0f9831b7b64be35c2ec790bdec' into HEADThe Android Open Source Project2013-11-222-3/+53
| | |\
* | | \ Merge "keymaster: rename ion_allocation_data.heap_mask to heap_id_mask"Rom Lemarchand2013-11-071-1/+1
|\ \ \ \
| * | | | keymaster: rename ion_allocation_data.heap_mask to heap_id_maskRom Lemarchand2013-10-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename the heap_mask field in ion_allocation_data struct to heap_id_mask and match the new kernel header. Change-Id: Id149868c13b19023f1d35dabd4222f0342d2c44f
* | | | | am eab8a2ac: am f740c98b: Merge "do not use GNU old-style field designators"Nick Kralevich2013-11-061-11/+11
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | * commit 'eab8a2ac417ba93bdfb09ddcb6095580a0cef0c4': do not use GNU old-style field designators
| * | / am f740c98b: Merge "do not use GNU old-style field designators"Nick Kralevich2013-11-061-11/+11
| |\| | | | |/ | |/| | | | | | | * commit 'f740c98b96e14557b630ec5b16a2125afe424a2d': do not use GNU old-style field designators
| | * Merge "do not use GNU old-style field designators"Nick Kralevich2013-11-071-11/+11
| | |\
| | | * do not use GNU old-style field designatorssynergy dev2013-11-061-11/+11
| | |/ | | | | | | | | | | | | | | | Avoiding the use of gnu extensions improves code portability Change-Id: Ib55a2049670db9c84531b2be78a4ed0e078ae142
* | | am 7d563651: am e35dafa8: Merge "Use canonical UniquePtr.h header"Kenny Root2013-09-180-0/+0
|\| | | | | | | | | | | | | | * commit '7d563651aa956c0f9831b7b64be35c2ec790bdec': Use canonical UniquePtr.h header
| * | am e35dafa8: Merge "Use canonical UniquePtr.h header"Kenny Root2013-09-181-1/+2
| |\| | | | | | | | | | | | | * commit 'e35dafa88f1ba15a30b95556755ab17c7207be9d': Use canonical UniquePtr.h header
| | * Merge "Use canonical UniquePtr.h header"Kenny Root2013-09-111-1/+2
| | |\
| | | * Use canonical UniquePtr.h headerKenny Root2013-09-111-1/+2
| | |/ | | | | | | | | | Change-Id: I6856c5ff86f3c1d78c411900f46c501224e3ffc4
* | / Use canonical UniquePtr.h headerKenny Root2013-09-111-1/+2
|/ / | | | | | | Change-Id: I6856c5ff86f3c1d78c411900f46c501224e3ffc4
* | keymaster: Enable compilation for msm8226 based platformsAjay Dudani2013-08-201-1/+1
| | | | | | | | | | | | Enable keymaster for msm8226. Change-Id: Ibd8b0e935f01986c2920f75e04671413817ea980
* | keymaster: Add support for enabling CE clksAjay Dudani2013-06-131-0/+50
| | | | | | | | | | | | | | | | | | Before issuing a call to keymaster secure app, that require accessing the CE HW, clks needs to be enabled. Invoking QSEECom_set_bandwidth() before issuign the command does this enabling of CE clks Change-Id: I8f881be600223d4a8e3c098c93ec8b12a88a3850
* | keymaster: Add msm8974 archtecture and use TARGET_BOARD_PLATFORMSungmin Choi2013-05-241-3/+3
|/ | | | Change-Id: I8e5cf1baf96c4bc4669a5cb4a77697dbe59f390c
* keymaster: Add support for larger key sizeAjay Dudani2013-05-172-3/+3
| | | | | | | Added support for 3072/4096 bit key Bug: 8734191 Change-Id: I041fd65d4160b765ed38607e4237665bb47acc5d
* keymaster: Fixup ion allocation request to match kernel ion apiAjay Dudani2013-04-221-4/+4
| | | | | Bug: 8155492 Change-Id: Iebd6a18d5b86a88502ba697494b7d41b447a70b3
* keymaster: Add keymaster implementationAjay Dudani2012-11-214-0/+1296
| | | | | | | | Initial implementation of keymaster HAL APIs published in keymaster.h Bug: 7106634 Change-Id: I1b1f611f1988212ce5f6f7f03b9a59ca652d92cf Signed-off-by: Iliyan Malchev <malchev@google.com>
* Initial empty repositorycm-10.1-M3cm-10.1-M2cm-10.1-M1mr1.1-stagingChad Jones2012-09-300-0/+0