summaryrefslogtreecommitdiffstats
path: root/core/jni
Commit message (Expand)AuthorAgeFilesLines
* am 3856a219: am cecfb94f: Merge "Clean up argc / argv processing for runtime ...Narayan Kamath2014-04-091-17/+24
|\
| * Clean up argc / argv processing for runtime args.Narayan Kamath2014-04-091-17/+24
* | am 819239e5: Revert "Add stringType and requiredPermissions to SensorManager....Etienne Le Grand2014-04-051-12/+1
|\ \
| * | Revert "Add stringType and requiredPermissions to SensorManager.java, as well...Etienne Le Grand2014-04-051-12/+1
* | | am fd53d835: Add stringType and requiredPermissions to SensorManager.java, as...Etienne Le Grand2014-04-051-1/+12
|\ \ \ | |/ /
| * | Add stringType and requiredPermissions to SensorManager.java, as well as a pe...Etienne Le Grand2014-04-041-1/+12
| * | DO NOT MERGE change Surface constructor arg to 64bitChong Zhang2014-03-241-1/+2
* | | am f87b3a25: am 374db6c3: Merge "Remove ProcessState::mArgc,mArgV,mArgLen"Narayan Kamath2014-04-032-5/+12
|\ \ \ | | |/ | |/|
| * | Remove ProcessState::mArgc,mArgV,mArgLenNarayan Kamath2014-04-032-5/+12
* | | am ea9e5eca: am 17b1b8fe: Merge "Move zygote startup logic to the frameworks."Narayan Kamath2014-04-023-1/+612
|\ \ \ | |/ /
| * | Move zygote startup logic to the frameworks.Narayan Kamath2014-04-023-1/+612
* | | resolved conflicts for merge of eaab4df0 to klp-modular-dev-plus-aospNarayan Kamath2014-03-279-54/+59
|\ \ \ | |/ /
| * | AArch64: Make frameworks/base code more portableAshok Bhat2014-03-279-54/+59
* | | am ea96d791: am 5f0d44f6: Merge "Fix scaleNinePatch."Narayan Kamath2014-03-251-1/+1
|\ \ \ | |/ /
| * | Fix scaleNinePatch.Narayan Kamath2014-03-241-1/+1
* | | am ca58036d: am cfd46dc4: am 610d401c: am e9c7fd2f: am 55371beb: am 754bf6ab:...Victoria Lease2014-03-201-1/+2
|\ \ \ | | |/ | |/|
| * | am cfd46dc4: am 610d401c: am e9c7fd2f: am 55371beb: am 754bf6ab: am c8868db2:...Victoria Lease2014-03-191-1/+2
| |\ \
| | * \ am e9c7fd2f: am 55371beb: am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca:...Victoria Lease2014-03-191-1/+2
| | |\ \
| | | * \ am 55371beb: am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f:...Victoria Lease2014-03-191-1/+2
| | | |\ \
| | | | * \ am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103:...Victoria Lease2014-03-191-1/+2
| | | | |\ \
| | | | | * \ am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7:...Victoria Lease2014-03-191-1/+2
| | | | | |\ \
| | | | | | * \ am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7:...Victoria Lease2014-03-191-1/+2
| | | | | | |\ \
| | | | | | | * \ am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advancesVictoria Lease2014-03-191-1/+2
| | | | | | | |\ \
| | | | | | | | * \ am 183f97b7: am 1c12f9e7: malloc some advancesVictoria Lease2014-03-191-1/+2
| | | | | | | | |\ \
| | | | | | | | | * \ am 1c12f9e7: malloc some advancesVictoria Lease2014-03-191-1/+2
| | | | | | | | | |\ \
| | | | | | | | | | * | malloc some advancesVictoria Lease2014-03-181-1/+2
| | * | | | | | | | | | Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG...Leon Scroggins III2014-03-071-22/+47
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2Leon Scroggins III2014-03-071-22/+47
| | * | | | | | | | | | | EGL14.eglCreateWindowSurface should set producerControlledByAppTakahiro Aizawa2014-03-061-1/+1
| | |/ / / / / / / / / /
| | * | | | | | | | | | Update framework to use M33 Skia. DO NOT MERGELeon Scroggins III2014-03-0618-184/+206
* | | | | | | | | | | | am c850102d: am 0da4ad42: Merge "Don\'t register methods when there\'s nothin...Narayan Kamath2014-03-201-11/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | Don't register methods when there's nothing to register.Narayan Kamath2014-03-191-11/+1
* | | | | | | | | | | | am d2133079: am 7c0dfed5: Merge "Pass int32_t for JNI calls to java Input/Out...Narayan Kamath2014-03-181-7/+16
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Pass int32_t for JNI calls to java Input/Output streams.Ashok Bhat2014-03-171-7/+16
* | | | | | | | | | | | am 2fd045c0: DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-M...Leon Scroggins III2014-03-171-22/+47
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2Leon Scroggins III2014-03-171-22/+47
* | | | | | | | | | | | am f8d8777d: Update framework to use M33 Skia. DO NOT MERGELeon Scroggins III2014-03-1718-184/+207
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Update framework to use M33 Skia. DO NOT MERGELeon Scroggins III2014-03-1718-184/+207
| * | | | | | | | | | | DO NOT MERGE EGL14.eglCreateWindowSurface should set producerControlledByAppTakahiro Aizawa2014-02-251-1/+1
* | | | | | | | | | | | am 788fb96d: am 47653f2d: Merge "Move options buffers to top scope"Dave Allison2014-03-141-23/+29
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Move options buffers to top scopeDave Allison2014-03-141-23/+29
* | | | | | | | | | | | am b071a07d: am a79af364: Merge "Remove java.io.tmpdir assignment in AndroidR...Narayan Kamath2014-03-111-7/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Remove java.io.tmpdir assignment in AndroidRuntime (again).Narayan Kamath2014-03-111-7/+0
* | | | | | | | | | | | am ec4c7752: am ab97d617: Merge "Only pass -Xprofile-* options to ART"Brian Carlstrom2014-03-101-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Only pass -Xprofile-* options to ARTBrian Carlstrom2014-03-101-3/+4
* | | | | | | | | | | | am bbf82665: am 6e2fb587: Merge "LP64: Make 9 patches architecture agnostic."Narayan Kamath2014-03-104-20/+27
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | LP64: Make 9 patches architecture agnostic.Narayan Kamath2014-03-104-20/+27
* | | | | | | | | | | | am b94904ab: am 3fc3b9fd: Merge "ART profiler usage."Dave Allison2014-03-081-0/+43
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | ART profiler usage.Dave Allison2014-03-071-0/+43
* | | | | | | | | | | | am 485e3b45: am 5c126c3d: Merge "Add dex2oat-flags plumbing to AndroidRuntime"Brian Carlstrom2014-03-051-6/+27
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /