summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Expand)AuthorAgeFilesLines
* am 00cfbe82: am a5608acb: Merge "Don\'t allow MemoryFiles of negative length."Narayan Kamath2014-04-091-2/+7
|\
| * Don't allow MemoryFiles of negative length.Narayan Kamath2014-04-081-2/+7
* | am ea72cdf2: Merge "Move display power controller to display manager service....Jeff Brown2014-04-091-0/+164
|\ \
| * | Move display power controller to display manager service. (DO NOT MERGE)Jeff Brown2014-04-081-0/+164
* | | am 819239e5: Revert "Add stringType and requiredPermissions to SensorManager....Etienne Le Grand2014-04-051-200/+8
|\ \ \ | |/ /
| * | Revert "Add stringType and requiredPermissions to SensorManager.java, as well...Etienne Le Grand2014-04-051-200/+8
* | | am fd53d835: Add stringType and requiredPermissions to SensorManager.java, as...Etienne Le Grand2014-04-051-8/+200
|\ \ \ | |/ /
| * | Add stringType and requiredPermissions to SensorManager.java, as well as a pe...Etienne Le Grand2014-04-041-8/+200
* | | am 4ed27328: am dc97144b: Merge "Always call super.onCreate(). Always."Nick Kralevich2014-04-041-2/+4
|\ \ \ | | |/ | |/|
| * | Always call super.onCreate(). Always.Christopher Tate2014-04-041-2/+4
* | | am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp...John Spurlock2014-04-042-5/+13
|\ \ \ | | |/ | |/|
| * | Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-devJohn Spurlock2014-04-042-5/+13
| |\ \
| | * | Introduce new UI_MODE_TYPE_WATCH and qualifier.John Spurlock2014-04-042-5/+13
* | | | am d10b6543: am 5df82523: am ff3d89c0: Merge "docs: Added permissions note fo...Ricardo Cervera2014-04-041-1/+7
|\ \ \ \ | |/ / /
| * | | am 5df82523: am ff3d89c0: Merge "docs: Added permissions note for Context.get...Ricardo Cervera2014-04-041-1/+7
| |\ \ \ | | |/ / | |/| |
| | * | docs: Added permissions note for Context.getFilesDir. Bug: 13716053Ricardo Cervera2014-04-041-1/+7
* | | | am 24a2f20f: am c420ce34: Merge "Marquee text RTL improvements"Raph Levien2014-04-031-4/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge "Marquee text RTL improvements"Raph Levien2014-04-031-4/+4
| |\ \ \
| | * | | Marquee text RTL improvementsMichael Lekman2014-03-251-4/+4
* | | | | am 14424043: am 369a0057: Merge "Update ViewRootImpl for 64bit functor type."Ben Murdoch2014-04-031-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Update ViewRootImpl for 64bit functor type."Ben Murdoch2014-04-031-2/+2
| |\ \ \ \
| | * | | | Update ViewRootImpl for 64bit functor type.Ben Murdoch2014-04-021-2/+2
* | | | | | am 8db6d9af: Merge "Clean up certain state transitions in DreamService." into...Jeff Brown2014-04-031-35/+39
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge "Clean up certain state transitions in DreamService." into klp-modular-devJeff Brown2014-04-031-35/+39
| |\ \ \ \ \
| | * | | | | Clean up certain state transitions in DreamService.Jeff Brown2014-04-021-35/+39
* | | | | | | am 31518f74: Merge "Use build property for CEC device OSD name" into klp-modu...Jinsuk Kim2014-04-031-1/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Use build property for CEC device OSD nameJinsuk Kim2014-04-031-1/+0
* | | | | | | am b1dca162: Merge "Maintain display power status for playback device" into k...Jinsuk Kim2014-04-024-7/+20
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Maintain display power status for playback device" into klp-modular-devJinsuk Kim2014-04-024-7/+20
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Maintain display power status for playback deviceJinsuk Kim2014-04-024-7/+20
* | | | | | | am ea9e5eca: am 17b1b8fe: Merge "Move zygote startup logic to the frameworks."Narayan Kamath2014-04-025-9/+169
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Move zygote startup logic to the frameworks.Narayan Kamath2014-04-025-9/+169
| | |_|/ / / | |/| | | |
* | | | | | am 905a5b14: am 87d9d1a0: Doc Update: revert PendingIntent fix.Katie McCormick2014-04-011-2/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 87d9d1a0: Doc Update: revert PendingIntent fix.Katie McCormick2014-04-011-2/+2
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Doc Update: revert PendingIntent fix.Katie McCormick2014-03-311-2/+2
* | | | | | am ae1b763c: Merge "LE: Add API to configure MTU for a given connection (3/4)...Zhihai Xu2014-03-315-0/+72
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "LE: Add API to configure MTU for a given connection (3/4)" into klp-mo...Zhihai Xu2014-03-315-0/+72
| |\ \ \ \ \
| | * | | | | LE: Add API to configure MTU for a given connection (3/4)Andre Eisenbach2014-03-255-0/+72
* | | | | | | am b11952d6: am e3434fc4: Merge "Improve detail message for X509TrustManagerE...Brian Carlstrom2014-03-311-1/+2
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Improve detail message for X509TrustManagerExtensions argument validationBrian Carlstrom2014-03-311-1/+2
* | | | | | | am 4447405d: Merge "Callback on correct method when status is unsuccessful." ...Wei Wang2014-03-291-2/+14
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge "Callback on correct method when status is unsuccessful." into klp-modu...Wei Wang2014-03-291-2/+14
| |\ \ \ \ \ \
| | * | | | | | Callback on correct method when status is unsuccessful.Wei Wang2014-03-291-2/+14
* | | | | | | | am e9eb58c9: Merge "Add InputDevice#supportsSource(int)." into klp-modular-devMichael Wright2014-03-291-0/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Add InputDevice#supportsSource(int)." into klp-modular-devMichael Wright2014-03-291-0/+12
| |\ \ \ \ \ \ \
| | * | | | | | | Add InputDevice#supportsSource(int).Michael Wright2014-03-281-0/+12
* | | | | | | | | am d020fd33: Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-devMichael Wright2014-03-297-16/+47
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-devMichael Wright2014-03-297-16/+47
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGEMichael Wright2014-03-262-6/+18
| | * | | | | | | | Adds API for determining confirm and cancel keys.Michael Wright2014-03-265-10/+29
| | |/ / / / / / /