summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | Merge "camera2: Adding legacy mode support for teeing to Video."Ruben Brunk2014-06-175-30/+215
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | camera2: Adding legacy mode support for teeing to Video.Ruben Brunk2014-06-175-30/+215
* | | | | | | | | | | | | | | | | | | | | | | | am 0ead2a00: am 15967d0a: am 88b37eda: Merge "Fix reading memory usage for 64...Colin Cross2014-06-171-8/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | / / / / / / / / / / / / / / | | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | am 15967d0a: am 88b37eda: Merge "Fix reading memory usage for 64-bit processes"Colin Cross2014-06-171-8/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 88b37eda: Merge "Fix reading memory usage for 64-bit processes"Colin Cross2014-06-171-8/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Fix reading memory usage for 64-bit processes"Colin Cross2014-06-171-8/+8
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | Fix reading memory usage for 64-bit processesColin Cross2014-06-171-8/+8
* | | | | | | | | | | | | | | | | | | | | | | | | | camera2: Map camera characteristics in the managed layerIgor Murashkin2014-06-176-10/+302
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add READ_ALL_VOICEMAIL permission in the core"fafaisland2014-06-173-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Add READ_ALL_VOICEMAIL permission in the corefafaisland2014-06-173-0/+15
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Switch from Droid -> Noto for RS fonts."Stephen Hines2014-06-171-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Switch from Droid -> Noto for RS fonts.Stephen Hines2014-06-111-4/+4
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use the right package name for MountServiceIdler"Christopher Tate2014-06-171-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the right package name for MountServiceIdlerChristopher Tate2014-06-171-2/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Publish DevicePolicyManager CA certificate APIs""Robin Lee2014-06-175-74/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Publish DevicePolicyManager CA certificate APIs"Robin Lee2014-06-175-74/+51
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add attributes and accessors for tinting View drawables"Alan Viverette2014-06-1710-74/+1331
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Add attributes and accessors for tinting View drawablesAlan Viverette2014-06-1710-74/+1331
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Not touchable windows should not hide windows behindSvetoslav2014-06-171-2/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fixed a bug with overscrolling on the bottom."Selim Cinek2014-06-171-6/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed a bug with overscrolling on the bottom.Selim Cinek2014-06-171-6/+10
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix setLayerType"John Reck2014-06-171-9/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix setLayerTypeJohn Reck2014-06-171-9/+4
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Switch everything to scheduled jobs"Christopher Tate2014-06-1716-1434/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch everything to scheduled jobsChristopher Tate2014-06-1716-1434/+54
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Tweak restore API"Christopher Tate2014-06-176-54/+303
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tweak restore APIChristopher Tate2014-06-176-54/+303
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET"Brian Attwell2014-06-171-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESETBrian Attwell2014-06-171-2/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "First pass at FingerprintService integration with HAL. Move Fingerprin...Jim Miller2014-06-1712-331/+683
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | First pass at FingerprintService integration with HAL.Jim Miller2014-06-1712-331/+683
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Added primitive parameters to various functions requiring rectangles."Chris Craik2014-06-176-105/+189
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Added primitive parameters to various functions requiring rectangles.Antonio Calabrese2014-06-176-105/+189
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add abort logging for huge scales and tessellation recursion depth"Chris Craik2014-06-173-11/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add abort logging for huge scales and tessellation recursion depthChris Craik2014-06-173-11/+33
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge changes Id7ae3838,I8e297443George Mount2014-06-179-104/+653
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix NPE when shared elements are empty.George Mount2014-06-171-2/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow antroid.transition Transitions in fragments.George Mount2014-06-178-102/+649
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Change am get-config command to use ABI string arrayAdam Lesinski2014-06-171-5/+2
|/ / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Adds speakerphone extra to ACTION_DIAL (2/2)."Sai Cheemalapati2014-06-172-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Adds speakerphone extra to ACTION_DIAL (2/2).Sai Cheemalapati2014-06-172-0/+9
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Passpoint OSU bug fix + API renameYuhao Zheng2014-06-172-56/+56
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Implement Paint.breakText() using Minikin"Anish Athalye2014-06-172-27/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Implement Paint.breakText() using MinikinAnish Athalye2014-06-172-27/+61
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | am 1d3f9b72: am 0bfee5a4: Merge "fix javadocs b/14414251" into klp-modular-devRobert Ly2014-06-171-30/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | am 0bfee5a4: Merge "fix javadocs b/14414251" into klp-modular-devRobert Ly2014-06-171-30/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge "fix javadocs b/14414251" into klp-modular-devRobert Ly2014-06-171-30/+30
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | fix javadocs b/14414251Robert Ly2014-06-081-30/+30
* | | | | | | | | | | | | | | | | | | | | | | | | | | am f5cb96cf: am 51736de1: am 4c488cca: Merge "[Asset Manager] Fix memory leak...Adam Lesinski2014-06-171-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | / / / / / / / / / / / / / / / / / / / / / / | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | am 51736de1: am 4c488cca: Merge "[Asset Manager] Fix memory leakage bug"Adam Lesinski2014-06-171-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | |