summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Refactoring out some params code.Alex Sakhartchouk2012-01-204-56/+21
| | | | Change-Id: Ie4268faeefd6858057c242bea98aceb3800cef75
* Merge "Many optimizations of rendering path. Adding ability to split up per ↵Alex Sakhartchouk2012-01-2022-171/+790
|\ | | | | | | shader and per object updates. Added cubemaps as scenegraph objects." into graphics-dev
| * Many optimizations of rendering path.Alex Sakhartchouk2012-01-2022-171/+790
| | | | | | | | | | | | | | Adding ability to split up per shader and per object updates. Added cubemaps as scenegraph objects. Change-Id: I7877658c35ad1407444e1e092c7634b46d745691
* | am 1bf599a0: Merge "Initialize SQLite as part of the android runtime."Jeff Brown2012-01-206-58/+83
|\ \ | | | | | | | | | | | | * commit '1bf599a01e7ad720150d8cc12416ba67bebd74c9': Initialize SQLite as part of the android runtime.
| * \ Merge "Initialize SQLite as part of the android runtime."Jeff Brown2012-01-206-58/+83
| |\ \
| | * | Initialize SQLite as part of the android runtime.Jeff Brown2012-01-206-58/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that the SQLite library is always correctly configured and initialized before other framework or application code has a chance to use it. This is important because initialization has to happen at most once so we need to get it right and prevent races. This change makes it possible to omit the SQLite auto-initialization workaround from the SQLite library, potentially saving a few cycles here and there. Change-Id: Ifbed8685ee44aa1e9c0b391e233b0257fa738e4f
* | | | am 2f9510ca: Merge "Touch moves cursor in text refactored"Gilles Debunne2012-01-202-16/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '2f9510ca50b0fd2925bc7e349f76136ed403a386': Touch moves cursor in text refactored
| * | | Merge "Touch moves cursor in text refactored"Gilles Debunne2012-01-202-16/+7
| |\ \ \
| | * | | Touch moves cursor in text refactoredGilles Debunne2012-01-192-16/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code was moved back from the movement method to the touch event code in TextView. Change-Id: I7dc0d957554ddce08e810d20e0385f98802ef1a4
* | | | | am e8bb6fef: Merge "Starhub RTSP apparently does not establish time on all ↵Andreas Huber2012-01-201-1/+29
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | tracks" * commit 'e8bb6fef58dfa94346d8a72c1eb9046d5d1f2da1': Starhub RTSP apparently does not establish time on all tracks
| * | | | Merge "Starhub RTSP apparently does not establish time on all tracks"Andreas Huber2012-01-201-1/+29
| |\ \ \ \
| | * | | | Starhub RTSP apparently does not establish time on all tracksAndreas Huber2012-01-201-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i.e. the "SR" RTCP packet is sent for only one of the two tracks. fake timestamps if that's the case, previously we'd only fake timestamps if we didn't receive _any_ "SR" packets. Change-Id: Id63d4940d453ba6c04c62e02ab9a0ad843936bc1 related-to-bug: 5669027
* | | | | | am c79e4139: Merge "Fix typos in string constants"Glenn Kasten2012-01-202-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'c79e413911d48ebf14621304655029f6cd2c7959': Fix typos in string constants
| * | | | | Merge "Fix typos in string constants"Glenn Kasten2012-01-202-2/+2
| |\ \ \ \ \
| | * | | | | Fix typos in string constantsGlenn Kasten2012-01-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were copy/paste errors in code that was copied from AudioTrack. Change-Id: I64a04d6026667884ddb1fefba67a71d69c691d62
* | | | | | | am 15f51cce: Merge "Remove dead file include/media/thread_init.h"Glenn Kasten2012-01-201-24/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '15f51ccee1fb4aaf9296998e68156903f0657098': Remove dead file include/media/thread_init.h
| * | | | | | Merge "Remove dead file include/media/thread_init.h"Glenn Kasten2012-01-201-24/+0
| |\ \ \ \ \ \
| | * | | | | | Remove dead file include/media/thread_init.hGlenn Kasten2012-01-191-24/+0
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I98688bb7109b5f82953988935c7c33fe3c7f4ec0
* | | | | | | am ea46649a: Merge "Remove redundant get()"Glenn Kasten2012-01-204-6/+6
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'ea46649a1cce7447ece812e60168f2bb3db47122': Remove redundant get()
| * | | | | | Merge "Remove redundant get()"Glenn Kasten2012-01-204-6/+6
| |\ \ \ \ \ \
| | * | | | | | Remove redundant get()Glenn Kasten2012-01-204-6/+6
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get() is almost always unnecessary, except in a LOG. Also no need to check for != 0 before calling get(). Change-Id: Ib06e7a503f86cf102f09acc1ffb2ad085025516d
* | | | | | | am 5ecff094: Merge "Move memcpy_to_i16_from_u8 to audio_utils"Glenn Kasten2012-01-201-13/+5
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '5ecff094f4df499f997bc9406c6e1a76a899aa12': Move memcpy_to_i16_from_u8 to audio_utils
| * | | | | | Merge "Move memcpy_to_i16_from_u8 to audio_utils"Glenn Kasten2012-01-201-13/+5
| |\ \ \ \ \ \
| | * | | | | | Move memcpy_to_i16_from_u8 to audio_utilsGlenn Kasten2012-01-171-13/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will make it easier for this kind of code to be optimized for each target architecture. Change-Id: I9efd27d6c0175b00b9a784353244805cec63c0b8
* | | | | | | | am 1d98303a: Merge "AOOB in AutoComplete"Gilles Debunne2012-01-201-2/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '1d98303ab6141af57dc841115486d9795fc94d02': AOOB in AutoComplete
| * | | | | | | Merge "AOOB in AutoComplete"Gilles Debunne2012-01-201-2/+3
| |\ \ \ \ \ \ \
| | * | | | | | | AOOB in AutoCompleteGilles Debunne2012-01-181-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5749557 Not clear how we can get an AOOB in that case. tmp will always have the right length, and indeed the stack trace attached to that bug shows a correct size of 10. However, there is an index issue when we build the new completion array. i is not the correct index to use. Note however that the original buildDropDown method mentioned is no longer present in the file. I tried to backtrack, but the use of arraycopy always seemed correct. Change-Id: Idf749c74b38923b5d18596c8e8f6ea887cc897d6
* | | | | | | | | am 7418c35d: Merge "Make sure text selection always starts"Gilles Debunne2012-01-201-5/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7418c35d80e3462fe6f80ed1394e2d31c8b1b6bf': Make sure text selection always starts
| * | | | | | | | Merge "Make sure text selection always starts"Gilles Debunne2012-01-201-5/+3
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Make sure text selection always startsGilles Debunne2012-01-191-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When text can indeed be selected, we should always initiate a text selection on long press. When the WordIterator fails (for instance if the text is entirely made of punctuation characters, maybe also with foreign languages), we select one character. Change-Id: I842507f7cbaed9a924d3176ea8ed6586f3548366
* | | | | | | | | | am 7524a592: Merge "Remove dead setRingerMode(mode, mask)"Glenn Kasten2012-01-208-50/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7524a592526a14d20ec3f3acffd61fe18afaa4b4': Remove dead setRingerMode(mode, mask)
| * | | | | | | | | Merge "Remove dead setRingerMode(mode, mask)"Glenn Kasten2012-01-208-50/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Remove dead setRingerMode(mode, mask)Glenn Kasten2012-01-188-50/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia4cc8be8424a40b3dcb7ebd0264fdff4e5247f7f
* | | | | | | | | | | am 1b4d6049: Merge "Fix build warning for void * arithmetic"Glenn Kasten2012-01-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1b4d60497c6c89ae1457e802446c83ca7c8c0017': Fix build warning for void * arithmetic
| * | | | | | | | | | Merge "Fix build warning for void * arithmetic"Glenn Kasten2012-01-201-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| | * | | | | | | | | Fix build warning for void * arithmeticGlenn Kasten2012-01-191-1/+1
| | | |_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | binder.c: In function 'bio_init': binder.c:415: warning: pointer of type 'void *' used in arithmetic Change-Id: I6926ad05e6dc7362331dffb6e8eca130955f25df
* | | | | | | | | | am f17e7c27: Merge "Fixes some javadoc."Pin Ting2012-01-201-3/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f17e7c272e27671d12fbf676d209f0a77f1acda1': Fixes some javadoc.
| * | | | | | | | | Merge "Fixes some javadoc."Pin Ting2012-01-201-3/+4
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| | * | | | | | | | Fixes some javadoc.Pin Ting2012-01-181-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4ad1f1452e2c8e004865853247e0b34b78bb1616
* | | | | | | | | | am 8592baa3: Merge "Don\'t need to link to libsqlite from media JNI library."Jeff Brown2012-01-191-1/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8592baa347f5874b4f36713b6ca2edcedbb3f071': Don't need to link to libsqlite from media JNI library.
| * | | | | | | | | Merge "Don't need to link to libsqlite from media JNI library."Jeff Brown2012-01-191-1/+0
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Don't need to link to libsqlite from media JNI library.Jeff Brown2012-01-191-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Media JNI library doesn't actually use libsqlite. Change-Id: If8017444d259779d459ef2da83119814e31454c2
* | | | | | | | | | | am 46deab0a: Merge "Clean up SQLiteDebug natives."Jeff Brown2012-01-192-47/+39
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '46deab0a694e7e3c79980904706a4d09bbda001a': Clean up SQLiteDebug natives.
| * | | | | | | | | | Merge "Clean up SQLiteDebug natives."Jeff Brown2012-01-192-47/+39
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Clean up SQLiteDebug natives.Jeff Brown2012-01-192-47/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In particular, ensure that the database is initialized. Change-Id: Ifa69a9dfa9d008af79beadbd1a25e90d0d29e66c
* | | | | | | | | | | am b815d0f8: Merge "Remove custom SQLITE_UNCLOSED error code."Jeff Brown2012-01-192-34/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b815d0f80ae58bc48008186d3919e7c6e51fb43e': Remove custom SQLITE_UNCLOSED error code.
| * | | | | | | | | | Merge "Remove custom SQLITE_UNCLOSED error code."Jeff Brown2012-01-192-34/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Remove custom SQLITE_UNCLOSED error code.Jeff Brown2012-01-192-34/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This error code was introduced at some point to help track when a database could not be closed because a statement was not finalized. Now that the DB wrappers have been rewritten, it is technically no longer poossible for this to happen, so we can remove this. Change-Id: Ibbd55debbf390af436d6533aebff9726b1ff29e7
* | | | | | | | | | | am 20c53cb3: Merge "Remove obsolete TODO comments"James Dong2012-01-196-139/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '20c53cb3aa8489c11004ac718c0891273391ac8c': Remove obsolete TODO comments
| * | | | | | | | | | Merge "Remove obsolete TODO comments"James Dong2012-01-196-139/+4
| |\ \ \ \ \ \ \ \ \ \