summaryrefslogtreecommitdiffstats
path: root/core/jni
Commit message (Expand)AuthorAgeFilesLines
* Merge "Encapsulate Canvas.mNativeCanvas"Florin Malita2014-05-073-68/+12
|\
| * Encapsulate Canvas.mNativeCanvasFlorin Malita2014-05-063-68/+12
* | Merge "Cleanup attachFunctor"John Reck2014-05-071-30/+0
|\ \
| * | Cleanup attachFunctorJohn Reck2014-05-071-30/+0
* | | Merge "Implement TODO(romainguy)"John Reck2014-05-071-0/+7
|\ \ \
| * | | Implement TODO(romainguy)John Reck2014-05-071-0/+7
| |/ /
* | | First pass at adding FingerprintManagerServiceJim Miller2014-05-072-0/+74
* | | Merge "Fix crash due to texture view callback threading invariants."Jeff Brown2014-05-071-2/+2
|\ \ \
| * | | Fix crash due to texture view callback threading invariants.Jeff Brown2014-05-061-2/+2
| |/ /
* | | Add AudioFormat.ENCODING_PCM_FLOATGlenn Kasten2014-05-061-0/+3
* | | Merge "Enable changing display configuration"Dan Stoza2014-05-061-16/+50
|\ \ \ | |/ / |/| |
| * | Enable changing display configurationDan Stoza2014-05-061-16/+50
* | | Implement loadSystemPropertiesJohn Reck2014-05-051-0/+7
| |/ |/|
* | Make RenderNodeAnimator and WebView play niceJohn Reck2014-05-051-3/+3
* | Merge "TIME LORD!"John Reck2014-05-051-3/+10
|\ \
| * | TIME LORD!John Reck2014-05-051-3/+10
* | | camera3: Update CameraMetadata vendor tag handling.Ruben Brunk2014-05-021-23/+48
|/ /
* | Merge "Revert "camera3: Update CameraMetadata vendor tag handling.""Ruben Brunk2014-05-031-48/+23
|\ \
| * | Revert "camera3: Update CameraMetadata vendor tag handling."Ruben Brunk2014-05-031-48/+23
* | | Merge "camera3: Update CameraMetadata vendor tag handling."Ruben Brunk2014-05-021-23/+48
|\ \ \ | |/ /
| * | camera3: Update CameraMetadata vendor tag handling.Ruben Brunk2014-04-291-23/+48
* | | Add CanvasProperty for drawCircleJohn Reck2014-05-027-85/+183
* | | Merge "fix AudioTrack and AudioRecord JNI"Eric Laurent2014-05-012-12/+74
|\ \ \
| * | | fix AudioTrack and AudioRecord JNIEric Laurent2014-04-302-12/+74
| | |/ | |/|
* | | am 6c2e8062: am 70344223: am fbb0ab02: Merge "Fix broken logging in Zygote.cpp."Narayan Kamath2014-05-011-7/+5
|\ \ \
| * \ \ 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
* | | | | | Merge "Add missing ifdefs"John Reck2014-05-012-0/+10
|\ \ \ \ \ \
| * | | | | | Add missing ifdefsJohn Reck2014-04-302-0/+10
| | |_|_|/ / | |/| | | |
* | | | | | am f84493ec: am 91ff3c18: am 7d3f9e97: Merge "Fix for native leaks in YuvToJp...Elliott Hughes2014-04-301-5/+6
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | 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
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \