summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* docs: Add text to JavaDocs regarding browser file access vulnerabilityJoe Fernandez2015-04-221-2/+6
* DO NOT MERGE Revert "Load libraries directly from apk"Kris Giesing2015-04-2014-236/+33
* DO NOT MERGE Revert "Add android.net.IpPrefix#contains()"Kris Giesing2015-04-204-49/+7
* am 51884f0e: am 499126c4: Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant."Alex Klyubin2015-04-161-2/+2
|\
| * am 499126c4: Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant."Alex Klyubin2015-04-161-2/+2
| |\
| | * Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant."Alex Klyubin2015-04-161-2/+2
| | |\
| | | * Add Keymaster KM_ORIGIN_UNKNOWN constant.Alex Klyubin2015-04-141-2/+2
* | | | am a2607ee4: am b9a78c79: Merge "Add IV-related Keymaster error codes."Alex Klyubin2015-04-161-0/+4
|\ \ \ \ | |/ / /
| * | | am b9a78c79: Merge "Add IV-related Keymaster error codes."Alex Klyubin2015-04-161-0/+4
| |\ \ \ | | |/ /
| | * | Add IV-related Keymaster error codes.Alex Klyubin2015-04-151-0/+4
* | | | Import translations. DO NOT MERGEGeoff Mendal2015-04-152-3/+3
* | | | am 895f3c27: am 6a47a861: Merge "Add getPrefixAids()."Martijn Coenen2015-04-151-1/+14
|\ \ \ \ | |/ / /
| * | | am 6a47a861: Merge "Add getPrefixAids()."Martijn Coenen2015-04-151-1/+14
| |\ \ \ | | |/ /
| | * | Merge "Add getPrefixAids()."Martijn Coenen2015-04-151-1/+14
| | |\ \
| | | * | Add getPrefixAids().Martijn Coenen2015-04-151-1/+14
* | | | | am d83a598c: am 82992b72: Merge "Fix javadoc error in Debug.getRuntimeStats()."Hiroshi Yamauchi2015-04-151-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 82992b72: Merge "Fix javadoc error in Debug.getRuntimeStats()."Hiroshi Yamauchi2015-04-151-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Fix javadoc error in Debug.getRuntimeStats().Hiroshi Yamauchi2015-04-141-1/+1
* | | | | am 04143fdd: am e38ee9df: Merge "Add Debug.getRuntimeStat()."Hiroshi Yamauchi2015-04-141-0/+90
|\ \ \ \ \ | |/ / / /
| * | | | am e38ee9df: Merge "Add Debug.getRuntimeStat()."Hiroshi Yamauchi2015-04-141-0/+90
| |\ \ \ \ | | |/ / /
| | * | | Add Debug.getRuntimeStat().Hiroshi Yamauchi2015-04-141-0/+90
| | | |/ | | |/|
* | | | am 402f2501: am 3312c6b9: Merge "Add android.net.IpPrefix#contains()"Erik Kline2015-04-144-7/+49
|\ \ \ \ | |/ / /
| * | | am 3312c6b9: Merge "Add android.net.IpPrefix#contains()"Erik Kline2015-04-144-7/+49
| |\ \ \ | | |/ /
| | * | Merge "Add android.net.IpPrefix#contains()"Erik Kline2015-04-144-7/+49
| | |\ \
| | | * | Add android.net.IpPrefix#contains()Erik Kline2015-04-144-7/+49
* | | | | am 1770f9cf: am 3afca74a: Merge "BatteryStats: Adds an additional condition t...Ruchi Kandoi2015-04-141-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 3afca74a: Merge "BatteryStats: Adds an additional condition to avoid Array...Ruchi Kandoi2015-04-141-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge "BatteryStats: Adds an additional condition to avoid ArrayIndexOutOfBou...Ruchi Kandoi2015-04-141-1/+1
| | |\ \ \
| | | * | | BatteryStats: Adds an additional condition to avoidRuchi Kandoi2014-07-081-1/+1
* | | | | | am f265bdbf: am d1af38a4: Merge "Use JCA names for block modes, paddings, and...Alex Klyubin2015-04-132-0/+62
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am d1af38a4: Merge "Use JCA names for block modes, paddings, and digests."Alex Klyubin2015-04-132-0/+62
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Use JCA names for block modes, paddings, and digests."Alex Klyubin2015-04-132-0/+62
| | |\ \ \ \
| | | * | | | Use JCA names for block modes, paddings, and digests.Alex Klyubin2015-04-132-0/+62
* | | | | | | am bd59764a: am 8f0e0c1f: Merge "Clean-up state if we have an exception when ...Wale Ogunwale2015-04-131-24/+42
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 8f0e0c1f: Merge "Clean-up state if we have an exception when acquiring pro...Wale Ogunwale2015-04-131-24/+42
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Clean-up state if we have an exception when acquiring provider"Wale Ogunwale2015-04-131-24/+42
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | | * | | | Clean-up state if we have an exception when acquiring providerWale Ogunwale2015-04-101-24/+42
* | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-04-105-15/+15
* | | | | | | am 99f4ac14: am 97fce66f: Merge "Make several key crypto parameters repeatable"Shawn Willden2015-04-101-6/+6
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 97fce66f: Merge "Make several key crypto parameters repeatable"Shawn Willden2015-04-101-6/+6
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Make several key crypto parameters repeatableChad Brubaker2015-04-101-6/+6
| | | |/ / / | | |/| | |
* | | | | | am c5f9683c: am a270264c: Merge "Track more changes to keymaster_defs.h"Alex Klyubin2015-04-101-18/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am a270264c: Merge "Track more changes to keymaster_defs.h"Alex Klyubin2015-04-101-18/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Track more changes to keymaster_defs.hAlex Klyubin2015-04-101-18/+1
* | | | | | am 5f8c17b9: am ba2836e6: Merge "Track recent keymaster_defs.h changes."Alex Klyubin2015-04-101-19/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am ba2836e6: Merge "Track recent keymaster_defs.h changes."Alex Klyubin2015-04-101-19/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Track recent keymaster_defs.h changes.Alex Klyubin2015-04-091-19/+1
| | |/ / /
* | | | | am 7f757130: am f324d245: Merge "Reuse dexopt method for both dex2oat and pat...Richard Uhler2015-04-092-28/+13
|\ \ \ \ \ | |/ / / /
| * | | | am f324d245: Merge "Reuse dexopt method for both dex2oat and patchoat."Richard Uhler2015-04-092-28/+13
| |\ \ \ \ | | |/ / /
| | * | | Merge "Reuse dexopt method for both dex2oat and patchoat."Richard Uhler2015-04-092-28/+13
| | |\ \ \ | | | |_|/ | | |/| |
generated by cgit v1.1 at 2024-05-28 18:31:40 +0000