summaryrefslogtreecommitdiffstats
path: root/core/jni
Commit message (Expand)AuthorAgeFilesLines
* am 472512f6: Merge "Fix incorrect prototype for JNI call"Jean-Baptiste Queru2012-02-131-1/+1
|\
| * Merge "Fix incorrect prototype for JNI call"Jean-Baptiste Queru2012-02-131-1/+1
| |\
| | * Fix incorrect prototype for JNI callBhanu Chetlapalli2012-01-311-1/+1
* | | am a081c7b8: Merge "Skia API changes as a result of an update to the Skia lib...Jean-Baptiste Queru2012-02-061-1/+1
|\ \ \ | |/ /
| * | Skia API changes as a result of an update to the Skia library.Derek Sollenberger2012-01-311-1/+1
| |/
* | am 9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT"Jean-Baptiste Queru2012-01-191-1/+1
|\ \ | |/
| * Rename LOG_ASSERT to ALOG_ASSERTSteve Block2012-01-191-1/+1
* | am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"Jean-Baptiste Queru2012-01-1948-306/+306
|\ \ | |/
| * Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)Steve Block2012-01-1948-306/+306
* | am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"Jean-Baptiste Queru2012-01-1920-74/+74
|\ \ | |/
| * Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)Steve Block2012-01-1920-74/+74
* | am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"Jean-Baptiste Queru2012-01-1914-73/+73
|\ \ | |/
| * Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)Steve Block2012-01-1914-73/+73
* | am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"Jean-Baptiste Queru2012-01-1924-86/+86
|\ \ | |/
| * Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)Steve Block2012-01-1924-86/+86
* | Merge ee4618bcJean-Baptiste Queru2012-01-1921-293/+293
|\ \ | |/
| * Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)Steve Block2012-01-1921-292/+292
* | am c318bbb0: Merge "Rename (IF_)LOG() to (IF_)ALOG()"Jean-Baptiste Queru2012-01-194-6/+6
|\ \ | |/
| * Rename (IF_)LOG() to (IF_)ALOG()Steve Block2012-01-184-6/+6
* | Merge "Fix issue with selecting proper JNI libraries" into ics-mr1Kenny Root2012-01-131-2/+14
|\ \
| * | Fix issue with selecting proper JNI librariesAnthony Mazzola2011-12-201-2/+14
| |/
* | Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot...Fabrice Di Meglio2012-01-051-1/+0
|/
* Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)Fabrice Di Meglio2011-12-062-19/+4
* Fix memory corruption issues in TextLayoutCache. (DO NOT MERGE)Jeff Brown2011-12-051-5/+18
* Fix issue #5614559: Registering surface error in...Dianne Hackborn2011-12-031-0/+20
* Disable GLES20Canvas on emu w/o native GLJesse Hall2011-12-021-1/+10
* Eliminate hw.keyboards system properties.Jeff Brown2011-11-151-7/+14
* Merge "Revert "Discard framebuffer rendering queues when discarding layers"" ...Dave Burke2011-11-141-5/+0
|\
| * Revert "Discard framebuffer rendering queues when discarding layers"Dave Burke2011-11-141-5/+0
* | Merge "Define, document, and test the behavior of very large SurfaceTextures"...Mathias Agopian2011-11-141-3/+3
|\ \ | |/ |/|
| * Define, document, and test the behavior of very large SurfaceTexturesMathias Agopian2011-11-111-3/+3
* | Merge "Discard framebuffer rendering queues when discarding layers Bug #55818...Mathias Agopian2011-11-141-0/+5
|\ \
| * | Discard framebuffer rendering queues when discarding layersRomain Guy2011-11-101-0/+5
* | | am f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls.Jeff Brown2011-11-111-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix bug in TextLayoutCacheKey handling embedded nulls.Jeff Brown2011-11-111-1/+1
* | | Merge "Fix NdefRecord byte-stream constructor." into ics-mr1Martijn Coenen2011-11-101-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix NdefRecord byte-stream constructor.Martijn Coenen2011-11-101-1/+1
* | | Merge "Terminate EGL when an app goes in the background" into ics-mr1Romain Guy2011-11-102-0/+28
|\ \ \
| * | | Terminate EGL when an app goes in the backgroundRomain Guy2011-11-103-0/+29
* | | | Merge "Initialize egl_cache with an app writeable file" into ics-mr1Romain Guy2011-11-103-0/+58
|\ \ \ \ | |_|/ / |/| | |
| * | | Initialize egl_cache with an app writeable fileRomain Guy2011-11-103-0/+58
| |/ /
* | | Throw TransactionTooLargeException when Binder transaction fails.Jeff Brown2011-11-081-8/+26
|/ /
* | am bcf05a69: Fix bug #5553401 TextLayoutCache is too verbose: "computeValuesW...Fabrice Di Meglio2011-11-021-1/+5
|\ \ | |/
| * Fix bug #5553401 TextLayoutCache is too verbose: "computeValuesWithHarfbuzz -...Fabrice Di Meglio2011-11-011-1/+5
* | Merge "Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" int...Fabrice Di Meglio2011-11-011-32/+44
|\ \
| * | Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGEFabrice Di Meglio2011-11-011-32/+44
* | | am bd9b1528: Merge "Add cdma_rmnet4 to list of monitored interfaces" into ics...Robert Greenwalt2011-11-011-0/+1
|\ \ \ | |/ / |/| / | |/
| * Merge "Add cdma_rmnet4 to list of monitored interfaces" into ics-mr0Robert Greenwalt2011-11-011-0/+1
| |\
| | * Add cdma_rmnet4 to list of monitored interfacesRobert Greenwalt2011-11-011-0/+1
| * | Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGEFabrice Di Meglio2011-11-011-32/+44
| |/