summaryrefslogtreecommitdiffstats
path: root/core/jni
Commit message (Expand)AuthorAgeFilesLines
* am c0f18b9d: am c4c77d63: Merge "Add property for background GC type"Mathieu Chartier2014-05-141-0/+8
|\
| * am c4c77d63: Merge "Add property for background GC type"Mathieu Chartier2014-05-141-0/+8
| |\
| | * Add property for background GC typeMathieu Chartier2014-05-141-0/+8
* | | am 4463cbc6: am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-081-2/+0
|\ \ \ | |/ /
| * | am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-081-2/+0
| |\ \ | | |/
| | * Remove unused LOCAL_LDLIBS.Ying Wang2014-05-071-2/+0
* | | am 70344223: am fbb0ab02: Merge "Fix broken logging in Zygote.cpp."Narayan Kamath2014-05-011-7/+5
|\ \ \ | |/ /
| * | am fbb0ab02: Merge "Fix broken logging in Zygote.cpp."Narayan Kamath2014-05-011-7/+5
| |\ \ | | |/
| | * Fix broken logging in Zygote.cpp.Narayan Kamath2014-05-011-7/+5
* | | am 91ff3c18: am 7d3f9e97: Merge "Fix for native leaks in YuvToJpegEncoder.cpp"Elliott Hughes2014-04-301-5/+6
|\ \ \ | |/ /
| * | am 7d3f9e97: Merge "Fix for native leaks in YuvToJpegEncoder.cpp"Elliott Hughes2014-04-301-5/+6
| |\ \ | | |/
| | * Merge "Fix for native leaks in YuvToJpegEncoder.cpp"Elliott Hughes2014-04-301-5/+6
| | |\
| | | * Fix for native leaks in YuvToJpegEncoder.cppPawel Augustyn2014-02-041-5/+6
| * | | Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEADBill Yi2014-04-2918-207/+256
| |\ \ \ | | |/ / | |/| |
| | * | am ea96d791: am 5f0d44f6: Merge "Fix scaleNinePatch."Narayan Kamath2014-03-251-1/+1
| | |\ \
| | * \ \ am cfd46dc4: am 610d401c: am e9c7fd2f: am 55371beb: am 754bf6ab: am c8868db2:...Victoria Lease2014-03-201-1/+2
| | |\ \ \
| | * \ \ \ am c850102d: am 0da4ad42: Merge "Don\'t register methods when there\'s nothin...Narayan Kamath2014-03-201-11/+1
| | |\ \ \ \
| | * \ \ \ \ am d2133079: am 7c0dfed5: Merge "Pass int32_t for JNI calls to java Input/Out...Narayan Kamath2014-03-181-7/+16
| | |\ \ \ \ \
| | * \ \ \ \ \ am 788fb96d: am 47653f2d: Merge "Move options buffers to top scope"Dave Allison2014-03-141-23/+29
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ am b071a07d: am a79af364: Merge "Remove java.io.tmpdir assignment in AndroidR...Narayan Kamath2014-03-131-7/+0
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ am ec4c7752: am ab97d617: Merge "Only pass -Xprofile-* options to ART"Brian Carlstrom2014-03-111-3/+4
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ am bbf82665: am 6e2fb587: Merge "LP64: Make 9 patches architecture agnostic."Narayan Kamath2014-03-114-20/+27
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ am b94904ab: am 3fc3b9fd: Merge "ART profiler usage."Dave Allison2014-03-111-0/+43
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ am 485e3b45: am 5c126c3d: Merge "Add dex2oat-flags plumbing to AndroidRuntime"Brian Carlstrom2014-03-111-6/+27
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ am 8fb22ae7: am eee2c72f: Merge "Various format string fixes for 64bit"Narayan Kamath2014-03-111-2/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ am 2525acf5: am e4dae5f2: Merge "AArch64: Make eglGetDisplay(int) work for EG...Narayan Kamath2014-03-111-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ am 7fe5978b: am 2ba70fd4: Merge "Use reinterpret_cast when an integer is cast...Narayan Kamath2014-03-117-30/+30
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a88abfb3: am 6ab07fac: Merge "Use long for pointers in opengl/EGL classes"Narayan Kamath2014-03-112-32/+57
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 9e413bf4: am bbfc08b3: Merge changes I6d4fdada,Ia34899a4Greg Hackmann2014-03-101-112/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 911b2ce3: am 4a642ee5: Merge "Remove unused JNITest class"Narayan Kamath2014-03-083-122/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am fca204a4: am 05cebdc2: Merge "Fix several bad function definitions."Narayan Kamath2014-03-072-9/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b152473f: am 9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit compa...Narayan Kamath2014-03-071-7/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 96ddea41: am 7c710936: Merge "Remove java.io.tmpdir assignment in AndroidR...Narayan Kamath2014-03-071-7/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3bec0fbb: am fa8f95e9: Merge "AArch64: Use long for pointers in SurfaceSes...Narayan Kamath2014-03-071-9/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 74ca3fd3: am bc57651f: Merge "DO NOT MERGE - merge nativeDecodeFileDescrip...Leon Scroggins III2014-03-071-22/+47
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aosp" into kl...Leon Scroggins III2014-03-0718-184/+207
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aospLeon Scroggins III2014-03-0618-184/+207
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am eacaa353: am c717179e: Merge "jni: android_util_Process 64 bit issues"Mark Salyzyn2014-04-241-16/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | jni: android_util_Process 64 bit issuesMark Salyzyn2014-04-241-16/+17
* | | | | | | | | | | | | | | | | | | | | | | | | | | am 7423510c: am da93c60d: Merge "jni: binder ptrdiff_t compile issues"Mark Salyzyn2014-04-181-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | jni: binder ptrdiff_t compile issuesMark Salyzyn2014-04-171-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | am 4037847c: am 73258630: Merge "jni: binder 64-bit compile issues"Mark Salyzyn2014-04-171-9/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | jni: binder 64-bit compile issuesMark Salyzyn2014-04-171-9/+10
* | | | | | | | | | | | | | | | | | | | | | | | | | | am 936e87e1: am 5788722d: Merge "frameworks: 64 bit compile issues"Mark Salyzyn2014-04-163-10/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | frameworks: 64 bit compile issuesMark Salyzyn2014-04-163-10/+15
* | | | | | | | | | | | | | | | | | | | | | | | | | | am cd4c1c71: Merge "Add stringType and requiredPermissions to SensorManager.j...Aravind Akella2014-04-111-1/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Add stringType and requiredPermissions to SensorManager.java, as well ...Aravind Akella2014-04-111-1/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Add stringType and requiredPermissions to SensorManager.java, as well as a pe...Aravind Akella2014-04-111-1/+12
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime." into...Adam Hampson2014-04-081-7/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime.Narayan Kamath2014-04-071-7/+0
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / /