summaryrefslogtreecommitdiffstats
path: root/core/jni
Commit message (Expand)AuthorAgeFilesLines
* am cc99b18c: am a6f70d8b: am 7fe5978b: am 2ba70fd4: Merge "Use reinterpret_ca...Narayan Kamath2014-02-257-30/+30
|\
| * am 7fe5978b: am 2ba70fd4: Merge "Use reinterpret_cast when an integer is cast...Narayan Kamath2014-02-257-30/+30
| |\
| | * Merge "Use reinterpret_cast when an integer is cast to a pointer"Narayan Kamath2014-02-257-30/+30
| | |\
| | | * Use reinterpret_cast when an integer is cast to a pointerAshok Bhat2014-02-247-30/+30
* | | | am d8410d38: am 614b00de: am a88abfb3: am 6ab07fac: Merge "Use long for point...Narayan Kamath2014-02-252-32/+57
|\ \ \ \ | |/ / /
| * | | am a88abfb3: am 6ab07fac: Merge "Use long for pointers in opengl/EGL classes"Narayan Kamath2014-02-252-32/+57
| |\ \ \ | | |/ /
| | * | Use long for pointers in opengl/EGL classesAshok Bhat2014-02-242-32/+57
| | |/
* | | Merge "Updates to the Skia API needed to merge the WebView m33 version of Skia."Derek Sollenberger2014-02-257-87/+96
|\ \ \
| * | | Updates to the Skia API needed to merge the WebView m33 version of Skia.Derek Sollenberger2014-02-247-87/+96
* | | | Improve how battery stats collects network stats.Dianne Hackborn2014-02-241-30/+163
|/ / /
* | | am 5f652b9f: am 0cab896a: resolved conflicts for merge of 9e413bf4 to klp-mod...Greg Hackmann2014-02-221-112/+0
|\ \ \ | |/ /
| * | resolved conflicts for merge of 9e413bf4 to klp-modular-dev-plus-aospGreg Hackmann2014-02-211-112/+0
| |\ \ | | |/
| | * Merge changes I6d4fdada,Ia34899a4Greg Hackmann2014-02-211-112/+0
| | |\
| | | * Move time setting code from SystemClock to AlarmManagerServiceGreg Hackmann2014-02-211-112/+0
* | | | am a1aeac80: am 25c55ca9: am 911b2ce3: am 4a642ee5: Merge "Remove unused JNIT...Narayan Kamath2014-02-213-122/+0
|\ \ \ \ | |/ / /
| * | | am 911b2ce3: am 4a642ee5: Merge "Remove unused JNITest class"Narayan Kamath2014-02-213-122/+0
| |\ \ \ | | |/ /
| | * | Remove unused JNITest classAshok Bhat2014-02-213-122/+0
| | |/
| * | am fca204a4: am 05cebdc2: Merge "Fix several bad function definitions."Narayan Kamath2014-02-202-9/+10
| |\ \ | | |/
| | * Merge "Fix several bad function definitions."Narayan Kamath2014-02-202-9/+10
| | |\
| | | * Fix several bad function definitions.Narayan Kamath2014-02-202-9/+10
| * | | am b152473f: am 9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit compa...Narayan Kamath2014-02-201-7/+5
| |\ \ \ | | |/ /
| | * | AArch64: Make AssetAtlasService 64-bit compatibleAshok Bhat2014-02-201-7/+5
| | |/
* | | Merge "AArch64: Make AssetAtlasService 64-bit compatible"Narayan Kamath2014-02-211-7/+5
|\ \ \
| * | | AArch64: Make AssetAtlasService 64-bit compatibleAshok Bhat2014-02-211-7/+5
* | | | Reapply "Refactor setting an SkPaint onto a hwui Layer."Derek Sollenberger2014-02-201-4/+2
|/ / /
* | | Update framework to enable Skia to run in debug mode.Derek Sollenberger2014-02-202-2/+1
* | | Merge "Fix layer recycling for GLRenderer"John Reck2014-02-201-0/+9
|\ \ \
| * | | Fix layer recycling for GLRendererJohn Reck2014-02-191-0/+9
* | | | Merge "Allow disabling layer rotation during screenshots"Dan Stoza2014-02-201-10/+16
|\ \ \ \
| * | | | Allow disabling layer rotation during screenshotsDan Stoza2014-02-141-10/+16
* | | | | Merge "Support HardwareLayers in RenderThread"John Reck2014-02-191-10/+43
|\ \ \ \ \
| * | | | | Support HardwareLayers in RenderThreadJohn Reck2014-02-191-10/+43
| | |/ / / | |/| | |
* | | | | Merge "Make outline and shadow APIs public"Chris Craik2014-02-191-4/+4
|\ \ \ \ \
| * | | | | Make outline and shadow APIs publicChris Craik2014-02-181-4/+4
* | | | | | am 29596ac2: am 41dd75f8: am 96ddea41: am 7c710936: Merge "Remove java.io.tmp...Narayan Kamath2014-02-191-7/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | am 96ddea41: am 7c710936: Merge "Remove java.io.tmpdir assignment in AndroidR...Narayan Kamath2014-02-191-7/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge "Remove java.io.tmpdir assignment in AndroidRuntime."Narayan Kamath2014-02-191-7/+0
| | |\ \ \
| | | * | | Remove java.io.tmpdir assignment in AndroidRuntime.Narayan Kamath2014-02-141-7/+0
* | | | | | Remove call to setIsOpaque (again).Leon Scroggins2014-02-171-1/+0
* | | | | | am 6795e9c7: am 7a66d8ea: am 3bec0fbb: am fa8f95e9: Merge "AArch64: Use long ...Narayan Kamath2014-02-141-9/+9
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 3bec0fbb: am fa8f95e9: Merge "AArch64: Use long for pointers in SurfaceSes...Narayan Kamath2014-02-141-9/+9
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "AArch64: Use long for pointers in SurfaceSession class"Narayan Kamath2014-02-141-9/+9
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | AArch64: Use long for pointers in SurfaceSession classAshok Bhat2014-02-061-9/+9
* | | | | | Merge "Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and th...Andreas Huber2014-02-133-77/+31
|\ \ \ \ \ \
| * | | | | | Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."Andreas Huber2014-02-133-77/+31
* | | | | | | Merge "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."Andreas Huber2014-02-133-31/+77
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Split AndroidRuntime into AndroidRuntimeBase base-class and the rest.Andreas Huber2014-02-123-31/+77
* | | | | | | am 4f2d02fb: am 20b5fd98: am 93994e9d: am a9bb594d: Merge "Convert all selinu...Nick Kralevich2014-02-131-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | am 93994e9d: am a9bb594d: Merge "Convert all selinux_android_restorecon and _...Nick Kralevich2014-02-121-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."Nick Kralevich2014-02-121-1/+1
| | |\ \ \ \