Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Add getPrefixAids()." | Martijn Coenen | 2015-04-15 | 1 | -1/+14 |
|\ | |||||
| * | Add getPrefixAids(). | Martijn Coenen | 2015-04-15 | 1 | -1/+14 |
* | | Merge "Fix javadoc error in Debug.getRuntimeStats()." | Hiroshi Yamauchi | 2015-04-14 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fix javadoc error in Debug.getRuntimeStats(). | Hiroshi Yamauchi | 2015-04-14 | 1 | -1/+1 |
* | | | Merge "Fix UB in ResourceTable::stringToInt." | Dan Albert | 2015-04-14 | 4 | -35/+155 |
|\ \ \ | |/ / |/| | | |||||
| * | | Fix UB in ResourceTable::stringToInt. | Dan Albert | 2015-04-08 | 4 | -35/+155 |
* | | | Merge "No need to specify EC curve name in EcIesParameterSpec." | Alex Klyubin | 2015-04-14 | 1 | -25/+2 |
|\ \ \ | |||||
| * | | | No need to specify EC curve name in EcIesParameterSpec. | Alex Klyubin | 2015-04-13 | 1 | -25/+2 |
* | | | | Merge "Make specifying self-signed cert parameters optional." | Alex Klyubin | 2015-04-14 | 2 | -40/+64 |
|\ \ \ \ | |||||
| * | | | | Make specifying self-signed cert parameters optional. | Alex Klyubin | 2015-04-14 | 2 | -40/+64 |
* | | | | | Merge "Add Debug.getRuntimeStat()." | Hiroshi Yamauchi | 2015-04-14 | 1 | -0/+90 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Add Debug.getRuntimeStat(). | Hiroshi Yamauchi | 2015-04-14 | 1 | -0/+90 |
|/ / / / | |||||
* | | | | Merge "Add name to ScriptGroup2.Builder.create() method" | Yang Ni | 2015-04-14 | 3 | -9/+15 |
|\ \ \ \ | |||||
| * | | | | Add name to ScriptGroup2.Builder.create() method | Yang Ni | 2015-04-13 | 3 | -9/+15 |
* | | | | | Merge "Add android.net.IpPrefix#contains()" | Erik Kline | 2015-04-14 | 6 | -7/+51 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Add android.net.IpPrefix#contains() | Erik Kline | 2015-04-14 | 6 | -7/+51 |
* | | | | | Merge "BatteryStats: Adds an additional condition to avoid ArrayIndexOutOfBou... | Ruchi Kandoi | 2015-04-14 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | BatteryStats: Adds an additional condition to avoid | Ruchi Kandoi | 2014-07-08 | 1 | -1/+1 |
* | | | | | | Merge "Add a name to ScriptGroup2.Builder.create method" | Yang Ni | 2015-04-13 | 1 | -1/+5 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Add a name to ScriptGroup2.Builder.create method | Yang Ni | 2015-04-13 | 1 | -1/+5 |
|/ / / / / | |||||
* | | | | | Merge "Use JCA names for block modes, paddings, and digests." | Alex Klyubin | 2015-04-13 | 17 | -1446/+1151 |
|\ \ \ \ \ | |||||
| * | | | | | Use JCA names for block modes, paddings, and digests. | Alex Klyubin | 2015-04-13 | 17 | -1446/+1151 |
* | | | | | | Merge "Clean-up state if we have an exception when acquiring provider" | Wale Ogunwale | 2015-04-13 | 1 | -24/+42 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Clean-up state if we have an exception when acquiring provider | Wale Ogunwale | 2015-04-10 | 1 | -24/+42 |
* | | | | | | Merge "Add EcIesParameterSpec to enable ECIES crypto." | Alex Klyubin | 2015-04-11 | 1 | -0/+287 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add EcIesParameterSpec to enable ECIES crypto. | Alex Klyubin | 2015-04-10 | 1 | -0/+287 |
* | | | | | | | Merge "Fix testSaw_ungrantedUid_Bluetooth" | Chad Brubaker | 2015-04-10 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix testSaw_ungrantedUid_Bluetooth | Chad Brubaker | 2015-04-10 | 1 | -2/+2 |
* | | | | | | | | Merge "Make several key crypto parameters repeatable" | Shawn Willden | 2015-04-10 | 1 | -6/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Make several key crypto parameters repeatable | Chad Brubaker | 2015-04-10 | 1 | -6/+6 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge "Check caller status precisely when registering receiver." | Olawale Ogunwale | 2015-04-10 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Check caller status precisely when registering receiver. | riddle_hsu | 2015-04-10 | 1 | -2/+3 |
* | | | | | | | | Merge "Track more changes to keymaster_defs.h" | Alex Klyubin | 2015-04-10 | 2 | -27/+6 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Track more changes to keymaster_defs.h | Alex Klyubin | 2015-04-10 | 2 | -27/+6 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge "Impose an ordering on created SELinuxMMAC Policy objects." | Nick Kralevich | 2015-04-10 | 1 | -53/+164 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Impose an ordering on created SELinuxMMAC Policy objects. | Robert Craig | 2015-04-10 | 1 | -53/+164 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge "Fix GL_INVALID_OPERATION in font renderer when font cache is limited." | John Reck | 2015-04-10 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix GL_INVALID_OPERATION in font renderer when font cache is limited. | chaochen | 2014-08-29 | 1 | -0/+2 |
* | | | | | | | | Merge "Fixing memory leak in RenderBufferCache" | John Reck | 2015-04-10 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fixing memory leak in RenderBufferCache | Samsung | 2014-09-24 | 1 | -0/+5 |
* | | | | | | | | | Merge "Add support for setting the cache directory." | Tim Murray | 2015-04-10 | 2 | -0/+26 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Add support for setting the cache directory. | Tim Murray | 2015-04-09 | 2 | -0/+26 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge "Track recent keymaster_defs.h changes." | Alex Klyubin | 2015-04-10 | 2 | -21/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Track recent keymaster_defs.h changes. | Alex Klyubin | 2015-04-09 | 2 | -21/+3 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge "Split key origin into TEE/not and generated/imported." | Alex Klyubin | 2015-04-09 | 3 | -15/+29 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Split key origin into TEE/not and generated/imported. | Alex Klyubin | 2015-04-09 | 3 | -15/+29 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge "Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category"" | Mathieu Chartier | 2015-04-09 | 1 | -2/+21 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category" | Mathieu Chartier | 2015-04-09 | 1 | -2/+21 |
|/ / / / / / / | |||||
* | | | | | | | Merge "Start passing volume UUID to installd." | Jeff Sharkey | 2015-04-09 | 1 | -2/+101 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Start passing volume UUID to installd. | Jeff Sharkey | 2015-04-09 | 1 | -2/+101 |
| | |_|_|_|_|/ | |/| | | | | |