summaryrefslogtreecommitdiffstats
path: root/core/jni
Commit message (Expand)AuthorAgeFilesLines
* Merge "Possible leak in android_emoji_EmojiFactory_newInstance"Victoria Lease2012-12-201-9/+5
|\
| * Possible leak in android_emoji_EmojiFactory_newInstanceYou Kim2012-12-121-9/+5
* | Merge "Leak in ToneGenerator_native_setup"Glenn Kasten2012-12-191-0/+1
|\ \
| * | Leak in ToneGenerator_native_setupYou Kim2012-12-071-0/+1
* | | Add return after NULL check in JetPlayerYou Kim2012-12-121-12/+24
| |/ |/|
* | convert jint to uint32_t.Nick Kralevich2012-12-071-2/+2
|/
* am f264e8e3: am 567a2919: Merge "Stop supplicant and dhcp before start" into ...Irfan Sheriff2012-11-081-3/+3
|\
| * am 567a2919: Merge "Stop supplicant and dhcp before start" into jb-mr1.1-devIrfan Sheriff2012-11-061-3/+3
| |\
| | * Stop supplicant and dhcp before startIrfan Sheriff2012-11-061-3/+3
* | | am fec5f611: Merge "It\'s 2012. We\'re always WITH_JIT."Elliott Hughes2012-11-072-12/+0
|\ \ \
| * | | It's 2012. We're always WITH_JIT.Elliott Hughes2012-11-062-12/+0
* | | | am 39c68da5: am cd79b35c: Merge "Surface: add the PhysicalDisplayInfo#secure ...Jamie Gennis2012-10-231-0/+3
|\ \ \ \ | | |/ / | |/| |
| * | | am cd79b35c: Merge "Surface: add the PhysicalDisplayInfo#secure field" into j...Jamie Gennis2012-10-231-0/+3
| |\ \ \ | | | |/ | | |/|
| | * | Merge "Surface: add the PhysicalDisplayInfo#secure field" into jb-mr1-devJamie Gennis2012-10-231-0/+3
| | |\ \
| | | * | Surface: add the PhysicalDisplayInfo#secure fieldJamie Gennis2012-10-231-0/+3
* | | | | am 6534dd02: am 74261d84: Merge "Don\'t null the reference to Bitmap pixels u...Chet Haase2012-10-221-4/+4
|\ \ \ \ \ | |/ / / /
| * | | | am 74261d84: Merge "Don\'t null the reference to Bitmap pixels until we\'re r...Chet Haase2012-10-221-4/+4
| |\ \ \ \ | | |/ / /
| | * | | Merge "Don't null the reference to Bitmap pixels until we're really ready" in...Chet Haase2012-10-221-4/+4
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Don't null the reference to Bitmap pixels until we're really readyChet Haase2012-10-221-4/+4
* | | | | am 9fee7bd7: am 23d62241: Merge "Set the secureness when creating displays" i...Jamie Gennis2012-10-221-3/+5
|\ \ \ \ \ | |/ / / /
| * | | | am 23d62241: Merge "Set the secureness when creating displays" into jb-mr1-devJamie Gennis2012-10-221-3/+5
| |\ \ \ \ | | |/ / /
| | * | | Set the secureness when creating displaysJamie Gennis2012-10-191-3/+5
| | |/ /
* | | | am 07a9ebd1: am b8460d15: Merge "Take into account the texture layer\'s trans...Romain Guy2012-10-171-1/+0
|\ \ \ \ | |/ / /
| * | | am b8460d15: Merge "Take into account the texture layer\'s transform for clip...Romain Guy2012-10-171-1/+0
| |\ \ \ | | |/ /
| | * | Take into account the texture layer's transform for clippingRomain Guy2012-10-171-1/+0
* | | | am b112bb66: am 0ee71add: Merge "Fix native crash while saving a panorama." i...Bart Sears2012-10-172-5/+11
|\ \ \ \ | |/ / /
| * | | am 0ee71add: Merge "Fix native crash while saving a panorama." into jb-mr1-devBart Sears2012-10-172-5/+11
| |\ \ \ | | |/ /
| | * | Merge "Fix native crash while saving a panorama." into jb-mr1-devBart Sears2012-10-172-5/+11
| | |\ \
| | | * | Fix native crash while saving a panorama.Wu-cheng Li2012-10-172-5/+11
* | | | | resolved conflicts for merge of 85f9ba9e to jb-mr1-dev-plus-aospKenny Root2012-10-172-63/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Remove HAVE_SELINUX guardsKenny Root2012-10-162-63/+1
* | | | | am fa71ba2c: am 1b85122b: Merge "Add API to enable mipmaps on Bitmap Bug #735...Romain Guy2012-10-161-1/+12
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 1b85122b: Merge "Add API to enable mipmaps on Bitmap Bug #7353771" into jb...Romain Guy2012-10-161-1/+12
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Add API to enable mipmaps on BitmapRomain Guy2012-10-161-1/+12
| | | |/ | | |/|
* | | | am 38041d6b: am 809bb404: Merge "Flag window animation transactions as animat...Jamie Gennis2012-10-151-0/+6
|\ \ \ \ | |/ / /
| * | | am 809bb404: Merge "Flag window animation transactions as animations." into j...Jamie Gennis2012-10-151-0/+6
| |\ \ \ | | |/ /
| | * | Flag window animation transactions as animations.Jamie Gennis2012-10-151-0/+6
* | | | am 27665148: am c378656d: Merge "fix wrong read size in ToColor_S4444_Opaque"...Keun young Park2012-10-121-1/+1
|\ \ \ \ | |/ / /
| * | | am c378656d: Merge "fix wrong read size in ToColor_S4444_Opaque" into jb-mr1-devKeun young Park2012-10-121-1/+1
| |\ \ \ | | |/ /
| | * | Merge "fix wrong read size in ToColor_S4444_Opaque" into jb-mr1-devKeun young Park2012-10-121-1/+1
| | |\ \
| | | * | fix wrong read size in ToColor_S4444_OpaqueKeun young Park2012-10-121-1/+1
* | | | | am af4228c1: am e8f4fa1c: Merge "Fix off-by-one." into jb-mr1-devJeff Brown2012-10-111-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am e8f4fa1c: Merge "Fix off-by-one." into jb-mr1-devJeff Brown2012-10-111-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Fix off-by-one.Jeff Brown2012-10-111-1/+1
| | |/ /
* | | | am d2d7d5c8: am 60fa4617: Merge changes I50eb7dcf,I7ae92ce1,Icb22db1c into jb...Jeff Brown2012-10-111-17/+79
|\ \ \ \ | |/ / /
| * | | am 60fa4617: Merge changes I50eb7dcf,I7ae92ce1,Icb22db1c into jb-mr1-devJeff Brown2012-10-101-17/+79
| |\ \ \ | | |/ /
| | * | Don't process UEvents in Dalvik unless they match a pattern.Jeff Brown2012-10-101-17/+79
* | | | am 7e466e89: am bcfc1ca8: Merge "Don\'t play notifications during speech reco...Jean-Michel Trivi2012-10-101-1/+10
|\ \ \ \ | |/ / /
| * | | am bcfc1ca8: Merge "Don\'t play notifications during speech recognition" into...Jean-Michel Trivi2012-10-101-1/+10
| |\ \ \ | | |/ /
| | * | Don't play notifications during speech recognitionJean-Michel Trivi2012-10-101-1/+10