summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Improve the AndroidKeyStore-backed HMAC state machine."Alex Klyubin2015-04-022-10/+18
|\
| * Improve the AndroidKeyStore-backed HMAC state machine.Alex Klyubin2015-04-012-10/+18
* | Merge "Expose new key use constraints in KeyPairGeneratorSpec."Alex Klyubin2015-04-023-17/+458
|\ \
| * | Expose new key use constraints in KeyPairGeneratorSpec.Alex Klyubin2015-04-023-17/+458
* | | Merge "Add exception types for AndroidKeyStore key validity issues."Alex Klyubin2015-04-024-0/+115
|\ \ \
| * | | Add exception types for AndroidKeyStore key validity issues.Alex Klyubin2015-04-014-0/+115
| | |/ | |/|
* | | Merge "[ActivityManager] Avoid improper resume top activity."Olawale Ogunwale2015-04-022-14/+10
|\ \ \ | |_|/ |/| |
| * | [ActivityManager] Avoid improper resume top activity.riddle_hsu2015-04-022-14/+10
* | | Merge "Early return in RemoteViewsAdapter is too late"Elliott Hughes2015-04-011-3/+3
|\ \ \ | |_|/ |/| |
| * | Early return in RemoteViewsAdapter is too lateHenrik Baard2014-11-271-3/+3
* | | Merge "Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString."Alex Klyubin2015-04-012-0/+57
|\ \ \
| * | | Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString.Alex Klyubin2015-04-012-0/+57
* | | | Merge "Use Keymaster-friendly validity dates."Alex Klyubin2015-04-013-27/+41
|\ \ \ \
| * | | | Use Keymaster-friendly validity dates.Alex Klyubin2015-04-013-27/+41
| |/ / /
* | | | Merge "Frameworks/base: Use system property for cache prune counter"Andreas Gampe2015-04-011-0/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Frameworks/base: Use system property for cache prune counterAndreas Gampe2015-04-011-0/+5
* | | | Merge "Hook in user authenticators and their exceptions."Alex Klyubin2015-04-019-30/+159
|\ \ \ \
| * | | | Hook in user authenticators and their exceptions.Alex Klyubin2015-03-319-30/+159
* | | | | Merge "A way to obtain KeyStore operation handle from crypto primitives."Alex Klyubin2015-04-014-3/+103
|\ \ \ \ \
| * | | | | A way to obtain KeyStore operation handle from crypto primitives.Alex Klyubin2015-03-314-3/+103
| |/ / / /
* | | | | Merge "[ActivityManager] Reduce report wrong anr activity"Olawale Ogunwale2015-04-012-15/+16
|\ \ \ \ \
| * | | | | [ActivityManager] Reduce report wrong anr activityriddle_hsu2015-04-012-15/+16
| | |_|_|/ | |/| | |
* | | | | Merge "idmap: scan missing include for sys/stat.h"Mark Salyzyn2015-04-011-2/+3
|\ \ \ \ \
| * | | | | idmap: scan missing include for sys/stat.hMark Salyzyn2015-04-011-2/+3
|/ / / / /
* | | | | Merge "app_main missing include for sys/stat.h"Mark Salyzyn2015-04-011-5/+6
|\ \ \ \ \
| * | | | | app_main missing include for sys/stat.hMark Salyzyn2015-04-011-5/+6
| |/ / / /
* | | | | Merge "[ActivityManager] Improve multi-thread access the same provider"Olawale Ogunwale2015-04-011-33/+69
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [ActivityManager] Improve multi-thread access the same providerriddle_hsu2015-04-011-33/+69
|/ / / /
* | | | Merge "UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH"Alex Klyubin2015-04-011-3/+4
|\ \ \ \ | |/ / / |/| | |
| * | | UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTHAlex Klyubin2015-03-311-3/+4
|/ / /
* | | Merge "Add license banner to recently added AndroidKeyStore files."Alex Klyubin2015-03-3114-0/+224
|\ \ \ | |/ / |/| |
| * | Add license banner to recently added AndroidKeyStore files.Alex Klyubin2015-03-3114-0/+224
|/ /
* | Merge "Add SecretKeyFactory backed by AndroidKeyStore."Alex Klyubin2015-03-316-1/+445
|\ \
| * | Add SecretKeyFactory backed by AndroidKeyStore.Alex Klyubin2015-03-316-1/+445
* | | Merge "Clear the previous states before setting the new app visibility"Craig Mautner2015-03-311-5/+5
|\ \ \
| * | | Clear the previous states before setting the new app visibilitytiger_huang2015-03-261-5/+5
* | | | Merge "Fix value size data type in closure creation."Yang Ni2015-03-312-4/+9
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix value size data type in closure creation.Yang Ni2015-03-302-4/+9
* | | | Merge "Add unauthenticated AES ciphers backed by AndroidKeyStore."Alex Klyubin2015-03-317-111/+758
|\ \ \ \
| * | | | Add unauthenticated AES ciphers backed by AndroidKeyStore.Alex Klyubin2015-03-317-111/+758
|/ / / /
* | | | Merge "Include operation handle in OperationResult"Chad Brubaker2015-03-311-0/+3
|\ \ \ \
| * | | | Include operation handle in OperationResultChad Brubaker2015-03-201-0/+3
* | | | | Merge "[ActivityManager] Fix index out of bounds when updating next pss time."Olawale Ogunwale2015-03-312-7/+13
|\ \ \ \ \
| * | | | | [ActivityManager] Fix index out of bounds when updating next pss time.riddle_hsu2015-03-312-7/+13
* | | | | | Merge "An updater for all timezone data on a device"Neil Fuller2015-03-314-35/+57
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | An updater for all timezone data on a deviceNeil Fuller2015-03-264-35/+57
* | | | | | Merge "Frameworks/base: Support dex2oat threads system property"Andreas Gampe2015-03-311-0/+5
|\ \ \ \ \ \
| * | | | | | Frameworks/base: Support dex2oat threads system propertyAndreas Gampe2015-03-301-0/+5
|/ / / / / /
* | | | | | Merge "Add ProcessInfoService to activity manager."Olawale Ogunwale2015-03-304-1/+75
|\ \ \ \ \ \
| * | | | | | Add ProcessInfoService to activity manager.Ruben Brunk2015-03-304-1/+75
| | |_|/ / / | |/| | | |