summaryrefslogtreecommitdiffstats
path: root/core/jni
Commit message (Expand)AuthorAgeFilesLines
* Merge "Bluetooth: correcting return value from cancelDiscovery"Jaikumar Ganesh2011-07-131-2/+7
|\
| * Bluetooth: correcting return value from cancelDiscoveryAlbert Mojir2011-03-211-2/+7
* | Add WEBP to the list of Image formats that support Compression.Vikas Arora2011-06-231-2/+5
* | Tweak setViewport stuff for fwd-compatJean-Baptiste Queru2011-06-082-18/+3
* | Merge "Use proper type for oob variable in register_agent. Without this chang...Jaikumar Ganesh2011-05-201-1/+1
|\ \
| * | Use proper type for oob variable in register_agent.Nicu Pavel2011-05-051-1/+1
* | | Adapt to latest skiaDerek Sollenberger2011-05-124-5/+2
* | | Ninepatch tweaks for better interopJean-Baptiste Queru2011-05-123-0/+106
* | | Switch to SkSafeUnref for better portabilityJean-Baptiste Queru2011-05-1210-13/+13
* | | am 1a5b6098: Handle GET_POWER failuresIrfan Sheriff2011-05-041-1/+3
|\ \ \ | |/ / |/| |
| * | Handle GET_POWER failuresIrfan Sheriff2011-05-041-1/+3
* | | Merge "Fix memory leak of SkMovie class"Conley Owens2011-04-291-0/+5
|\ \ \
| * | | Fix memory leak of SkMovie classKimiyoshi Kusaka2011-03-281-0/+5
| | |/ | |/|
* | | am 9907d161: Merge "Fix data corruption when writing to Bluetooth socket"Brad Fitzpatrick2011-04-041-7/+13
|\ \ \
| * | | Fix data corruption when writing to Bluetooth socketMike Playle2011-04-041-7/+13
| |/ /
* | | am 44220a56: Merge "Add some debug code to try to track down issue 3183612" i...Dianne Hackborn2011-03-151-0/+9
|\ \ \ | | |/ | |/|
| * | Add some debug code to try to track down issue 3183612Dianne Hackborn2011-03-141-0/+9
* | | am 4bdab175: DO NOT MERGE WiMAX supportTK MUN2011-03-091-0/+32
|\ \ \ | |/ / | | / | |/ |/|
| * DO NOT MERGE WiMAX supportTK MUN2011-03-091-0/+32
* | am 61d9ffbf: Merge "Do not merge." into gingerbreadWei-Ta Chen2011-01-137-1/+365
|\ \ | |/
| * Do not merge.Wei-Ta Chen2011-01-117-1/+365
* | am 251384a7: Merge "Improve performance when getting styled string."Brad Fitzpatrick2010-11-191-21/+0
|\ \
| * | Improve performance when getting styled string.Peter Eliasson2010-11-181-21/+0
* | | am 00e5dd44: Merge "Fix JNI reference leak in NativeActivity. (DO NOT MERGE)"...Jeff Brown2010-11-101-0/+2
|\ \ \ | | |/ | |/|
| * | Merge "Fix JNI reference leak in NativeActivity. (DO NOT MERGE)" into gingerb...Jeff Brown2010-11-101-0/+2
| |\ \
| | * | Fix JNI reference leak in NativeActivity. (DO NOT MERGE)Jeff Brown2010-11-081-0/+2
* | | | am 2e2983c6: Merge "Reduce log clutter." into gingerbreadJeff Hamilton2010-11-093-18/+19
|\ \ \ \ | |/ / /
| * | | Reduce log clutter.Jeff Hamilton2010-11-083-18/+19
| |/ /
* | | am 23656899: Merge "Fix issue #3126018: No way to specify NativeActivity\'s n...Dianne Hackborn2010-10-241-3/+7
|\ \ \ | |/ /
| * | Fix issue #3126018: No way to specify NativeActivity's native methodDianne Hackborn2010-10-241-3/+7
* | | am 0592832c: Merge "Attempt to fix simulator build." into gingerbreadNick Pelly2010-10-222-0/+4
|\ \ \ | |/ /
| * | Attempt to fix simulator build.Nick Pelly2010-10-222-0/+4
* | | am 389a440a: Backport ParcelFileDescriptor.createPipe() from master.Jeff Hamilton2010-10-211-0/+22
|\ \ \ | |/ /
| * | Backport ParcelFileDescriptor.createPipe() from master.Jeff Hamilton2010-10-211-0/+22
* | | am bf5efba2: Merge "Fix issue #3117918: No way to finish a native activity" i...Dianne Hackborn2010-10-211-2/+32
|\ \ \ | |/ /
| * | Fix issue #3117918: No way to finish a native activityDianne Hackborn2010-10-211-2/+32
* | | am db723ea0: Merge "jni: Remove duplicated jniThrowException()"Jean-Baptiste Queru2010-10-192-18/+2
|\ \ \ | | |/ | |/|
| * | jni: Remove duplicated jniThrowException()Jim Huang2010-10-172-18/+2
* | | am dd7341f7: Added missing implementation for NdefRecord.Sylvain Fonteneau2010-10-181-0/+84
|\ \ \ | | |/ | |/|
| * | Added missing implementation for NdefRecord.Sylvain Fonteneau2010-10-181-0/+84
* | | am 208bb08a: Merge "Fix issue 3098880." into gingerbreadEric Laurent2010-10-151-0/+4
|\ \ \ | |/ /
| * | Fix issue 3098880.Eric Laurent2010-10-151-0/+4
* | | Merge a851d8d0 from gingerbreadJean-Baptiste Queru2010-10-155-33/+329
|\ \ \ | |/ /
| * | NFC: Move NFC service implementation out of system_server.Nick Pelly2010-10-155-33/+329
* | | am bdf8034c: Merge "OBB: use PBKDF2 for key generation." into gingerbreadKenny Root2010-10-131-0/+11
|\ \ \ | |/ /
| * | OBB: use PBKDF2 for key generation.Kenny Root2010-10-131-0/+11
* | | am d577cfd7: Merge "Switch Looper back to using poll() instead of epoll()." i...Jeff Brown2010-10-071-21/+11
|\ \ \ | |/ /
| * | Switch Looper back to using poll() instead of epoll().Jeff Brown2010-10-071-21/+11
* | | am f7681f84: Do not merge.Wei-Ta Chen2010-10-015-335/+0
|\ \ \ | |/ /
| * | Do not merge.Wei-Ta Chen2010-10-015-335/+0