summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | | | | | | | | | | LE: Add API to configure MTU for a given connection (3/4)Andre Eisenbach2014-03-255-0/+72
* | | | | | | | | | | | | | | | am ce30fca8: am e531e2ec: am 3b2a9d22: Merge "Change when the SELinux relabel...Nick Kralevich2014-03-312-9/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | am e531e2ec: am 3b2a9d22: Merge "Change when the SELinux relabel of /data/dat...Nick Kralevich2014-03-312-9/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | am 3b2a9d22: Merge "Change when the SELinux relabel of /data/data occurs."Nick Kralevich2014-03-312-9/+21
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge "Change when the SELinux relabel of /data/data occurs."Nick Kralevich2014-03-312-9/+21
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | Change when the SELinux relabel of /data/data occurs.Robert Craig2014-03-282-9/+21
* | | | | | | | | | | | | | | | | Merge "Make the reveal animation API public"ztenghui2014-03-312-6/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Make the reveal animation API publicztenghui2014-03-312-6/+32
* | | | | | | | | | | | | | | | | | am 7156b7c6: am b11952d6: am e3434fc4: Merge "Improve detail message for X509...Brian Carlstrom2014-03-311-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | am b11952d6: am e3434fc4: Merge "Improve detail message for X509TrustManagerE...Brian Carlstrom2014-03-311-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | am e3434fc4: Merge "Improve detail message for X509TrustManagerExtensions arg...Brian Carlstrom2014-03-311-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge "Improve detail message for X509TrustManagerExtensions argument validat...Brian Carlstrom2014-03-311-1/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | Improve detail message for X509TrustManagerExtensions argument validationBrian Carlstrom2014-03-311-1/+2
| | | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | am fe710551: (-s ours) am ecaea7e6: Merge "Force refresh of stateful when a c...Craig Stout2014-03-310-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | am ecaea7e6: Merge "Force refresh of stateful when a child drawable is change...Craig Stout2014-03-311-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "Force refresh of stateful when a child drawable is changed." into klp-...Craig Stout2014-03-311-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Force refresh of stateful when a child drawable is changed.Craig Stout2014-03-271-0/+1
* | | | | | | | | | | | | | | | | | Merge "Fix build from multiple declaration"Glenn Kasten2014-03-311-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Fix build from multiple declarationGlenn Kasten2014-03-311-1/+0
* | | | | | | | | | | | | | | | | | | Add a SampleTrustAgentAdrian Roos2014-03-317-0/+323
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Make Keyguard trust awareAdrian Roos2014-03-316-8/+40
* | | | | | | | | | | | | | | | | | Merge "Define trust agent framework components"Adrian Roos2014-03-3112-5/+841
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Define trust agent framework componentsAdrian Roos2014-03-3112-5/+841
* | | | | | | | | | | | | | | | | | | Merge "Clean up LayerDrawable, ensure cached values are cleared on changes"Alan Viverette2014-03-311-59/+62
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Clean up LayerDrawable, ensure cached values are cleared on changesAlan Viverette2014-03-311-59/+62
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge "Remove unthemed drawable cache, since canApplyTheme != isThemed"Alan Viverette2014-03-311-54/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Remove unthemed drawable cache, since canApplyTheme != isThemedAlan Viverette2014-03-281-54/+5
* | | | | | | | | | | | | | | | | | | | Merge "Define initial trust agent API"Adrian Roos2014-03-318-0/+244
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Define initial trust agent APIAdrian Roos2014-03-318-0/+244
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge "Turn on RenderThread"John Reck2014-03-311-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Turn on RenderThreadJohn Reck2014-03-311-1/+1
* | | | | | | | | | | | | | | | | | | | Merge "Use set() return value instead of separate call to initCheck()"Glenn Kasten2014-03-312-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Use set() return value instead of separate call to initCheck()Glenn Kasten2014-03-282-6/+6
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge "add a null check around scrollAdapter access"Chris Wren2014-03-311-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | add a null check around scrollAdapter accessChris Wren2014-03-311-1/+2
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge "Include more information in AudioTrack JNI error logs"Glenn Kasten2014-03-311-10/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Include more information in AudioTrack JNI error logsGlenn Kasten2014-03-311-10/+15
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge "Add invokeFunctor"John Reck2014-03-3110-2/+100
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Add invokeFunctorJohn Reck2014-03-2810-2/+100
* | | | | | | | | | | | | | | | | | | | Merge "Synchronize channel masks in AudioFormat with system/audio.h"Glenn Kasten2014-03-311-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Synchronize channel masks in AudioFormat with system/audio.hGlenn Kasten2014-03-281-1/+8
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge "Fix warnings"Glenn Kasten2014-03-312-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Fix warningsGlenn Kasten2014-03-282-3/+3
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge "Fix typo"Glenn Kasten2014-03-311-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Fix typoGlenn Kasten2014-03-281-4/+4
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge "Mark the keyguard package as required for profile"Alexandra Gherghina2014-03-311-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Mark the keyguard package as required for profileAlexandra Gherghina2014-03-311-1/+2
* | | | | | | | | | | | | | | | | | | am 56a8f8b4: resolved conflicts for merge of 439145f0 to klp-modular-dev-plus...Narayan Kamath2014-03-312-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | resolved conflicts for merge of 439145f0 to klp-modular-dev-plus-aospNarayan Kamath2014-03-312-3/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | am ab561f5b: Merge "Don\'t make isSafeMode a field on the Zygote class."Narayan Kamath2014-03-312-2/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | | | |