Jeff Brown
4b57553e69
Initialize SQLite as part of the android runtime.
...
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
2012-01-20 13:08:03 -08:00
Glenn Kasten
c79e413911
Merge "Fix typos in string constants"
2012-01-20 12:16:06 -08:00
Glenn Kasten
15f51ccee1
Merge "Remove dead file include/media/thread_init.h"
2012-01-20 12:15:38 -08:00
Glenn Kasten
ea46649a1c
Merge "Remove redundant get()"
2012-01-20 12:14:32 -08:00
Dianne Hackborn
892d11f492
am 1bae8066: Merge "Fix issue #5823276 again: home repaints after full-screen app is exited" into ics-mr1
...
* commit '1bae80668cc1d12bb4a4b93bce1960b2601de131':
Fix issue #5823276 again: home repaints after full-screen app is exited
2012-01-20 12:03:47 -08:00
Dianne Hackborn
1bae80668c
Merge "Fix issue #5823276 again: home repaints after full-screen app is exited" into ics-mr1
2012-01-20 12:01:51 -08:00
Glenn Kasten
5ecff094f4
Merge "Move memcpy_to_i16_from_u8 to audio_utils"
2012-01-20 11:49:04 -08:00
Glenn Kasten
70ed6b744d
Remove redundant get()
...
get() is almost always unnecessary, except in a LOG.
Also no need to check for != 0 before calling get().
Change-Id: Ib06e7a503f86cf102f09acc1ffb2ad085025516d
2012-01-20 11:44:26 -08:00
Daniel Sandler
a64f899fa6
am 4d3161f3: Merge "Always show appropriate mobile service label." into ics-mr1
...
* commit '4d3161f379195302b720e120c5e6b65a0adfaf8c':
Always show appropriate mobile service label.
2012-01-20 11:31:10 -08:00
Daniel Sandler
4d3161f379
Merge "Always show appropriate mobile service label." into ics-mr1
2012-01-20 11:28:44 -08:00
Jeff Brown
1bc82792b8
am ad1f4a2c: Merge "Implement a max time bound for rotation. (DO NOT MERGE)" into ics-mr1
...
* commit 'ad1f4a2ca825b8524c6bed494a7cf3ca70ee7e28':
Implement a max time bound for rotation. (DO NOT MERGE)
2012-01-20 11:26:46 -08:00
Jeff Brown
06a0fb953f
am 5d58eb06: Merge "Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)" into ics-mr1
...
* commit '5d58eb06bcc8671bae72fb2389a9929e106131cc':
Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)
2012-01-20 11:26:43 -08:00
Jeff Brown
ad1f4a2ca8
Merge "Implement a max time bound for rotation. (DO NOT MERGE)" into ics-mr1
2012-01-20 11:24:13 -08:00
Jeff Brown
5d58eb06bc
Merge "Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)" into ics-mr1
2012-01-20 11:24:01 -08:00
Glenn Kasten
5eaa0f6dda
Fix warning for redundant typedef
...
frameworks/base/media/libmedia/autodetect.cpp:22: warning: 'typedef' was ignored in this declaration
Change-Id: I8c7404b9f5aa515c0fe92a5a46f24248d6fe96bf
2012-01-20 11:11:38 -08:00
Dianne Hackborn
cfbf7dedad
Fix issue #5823276 again: home repaints after full-screen app is exited
...
Don't consider a window as a candidate for the top fullscreen window
if it is not going to be a candiate for layout.
This fix does not include the change to ignore app tokens that are
hidden. This causes problems in some dialogs that stay hidden until
their app is ready to display, but need to perform a series of relayouts
during that time to get to the right size. Dropping this part of
the change still (mostly?) seems to allow us to avoid the bad states.
Change-Id: Ic052cb1499d3287f47e9ffeac5cd2470ee5a308c
2012-01-20 11:01:01 -08:00
Robert Greenwalt
470fd72a06
Log netd traffic nicely.
...
Create a LocalLog class for logging within a service for dumping in dumps.
Use it in the NativeDaemonConnector so we can get some insight into what
is happening in these lockups.
bug:5864209
Change-Id: I68ddc58847f3c8de613be9528570f8c3157d8274
2012-01-20 10:37:11 -08:00
Gilles Debunne
6e14668cc4
am 1d98303a: Merge "AOOB in AutoComplete"
...
* commit '1d98303ab6141af57dc841115486d9795fc94d02':
AOOB in AutoComplete
2012-01-20 10:28:56 -08:00
Gilles Debunne
af18cbfe21
am 7418c35d: Merge "Make sure text selection always starts"
...
* commit '7418c35d80e3462fe6f80ed1394e2d31c8b1b6bf':
Make sure text selection always starts
2012-01-20 10:28:53 -08:00
Gilles Debunne
1d98303ab6
Merge "AOOB in AutoComplete"
2012-01-20 10:27:10 -08:00
Gilles Debunne
7418c35d80
Merge "Make sure text selection always starts"
2012-01-20 10:27:00 -08:00
The Android Open Source Project
288cde7f0a
Reconcile with ics-mr1-release
...
Change-Id: I97a21a76245bb9212aab17c3e3c4856963d64b6c
2012-01-20 10:25:28 -08:00
Glenn Kasten
d0071bda1d
am 7524a592: Merge "Remove dead setRingerMode(mode, mask)"
...
* commit '7524a592526a14d20ec3f3acffd61fe18afaa4b4':
Remove dead setRingerMode(mode, mask)
2012-01-20 10:09:09 -08:00
Glenn Kasten
7524a59252
Merge "Remove dead setRingerMode(mode, mask)"
2012-01-20 10:07:06 -08:00
Glenn Kasten
a0b638a535
am 1b4d6049: Merge "Fix build warning for void * arithmetic"
...
* commit '1b4d60497c6c89ae1457e802446c83ca7c8c0017':
Fix build warning for void * arithmetic
2012-01-20 08:34:40 -08:00
Glenn Kasten
1b4d60497c
Merge "Fix build warning for void * arithmetic"
2012-01-20 08:32:45 -08:00
Michael Jurka
9e34b95a1d
Remove fastInvalidate and setFast* methods
...
- were only being used by Launcher, and they've been
removed from there too
Change-Id: I230e79c89a6450756220ad5cc07180bb5b725bd6
2012-01-20 07:27:09 -08:00
Pin Ting
1629a167e7
am f17e7c27: Merge "Fixes some javadoc."
...
* commit 'f17e7c272e27671d12fbf676d209f0a77f1acda1':
Fixes some javadoc.
2012-01-20 01:39:40 -08:00
Pin Ting
f17e7c272e
Merge "Fixes some javadoc."
2012-01-20 01:37:12 -08:00
Jeff Brown
e7c1de957a
am 8592baa3: Merge "Don\'t need to link to libsqlite from media JNI library."
...
* commit '8592baa347f5874b4f36713b6ca2edcedbb3f071':
Don't need to link to libsqlite from media JNI library.
2012-01-19 19:55:58 -08:00
Jeff Brown
93ff709045
am 46deab0a: Merge "Clean up SQLiteDebug natives."
...
* commit '46deab0a694e7e3c79980904706a4d09bbda001a':
Clean up SQLiteDebug natives.
2012-01-19 19:55:55 -08:00
Jeff Brown
ad979f3de8
am b815d0f8: Merge "Remove custom SQLITE_UNCLOSED error code."
...
* commit 'b815d0f80ae58bc48008186d3919e7c6e51fb43e':
Remove custom SQLITE_UNCLOSED error code.
2012-01-19 19:55:52 -08:00
Jeff Brown
8592baa347
Merge "Don't need to link to libsqlite from media JNI library."
2012-01-19 19:54:16 -08:00
Jeff Brown
46deab0a69
Merge "Clean up SQLiteDebug natives."
2012-01-19 19:54:05 -08:00
Jeff Brown
b815d0f80a
Merge "Remove custom SQLITE_UNCLOSED error code."
2012-01-19 19:53:38 -08:00
James Dong
4023d86a67
am 20c53cb3: Merge "Remove obsolete TODO comments"
...
* commit '20c53cb3aa8489c11004ac718c0891273391ac8c':
Remove obsolete TODO comments
2012-01-19 18:55:06 -08:00
James Dong
20c53cb3aa
Merge "Remove obsolete TODO comments"
2012-01-19 18:53:27 -08:00
Romain Guy
86fcb90f3b
am 22d41843: Fix the build, for real
...
* commit '22d418437e44587cb0fba4353515719453269189':
Fix the build, for real
2012-01-19 18:36:34 -08:00
Romain Guy
22d418437e
Fix the build, for real
...
Change-Id: I6263f7e5e3ae2f7efe045f8b464c0ed1b87fc793
2012-01-19 18:33:25 -08:00
Romain Guy
dec35b81b7
am 90bd1873: Merge "Fix build"
...
* commit '90bd18737a5ce16708003363683744cfd0480d83':
Fix build
2012-01-19 18:17:54 -08:00
Romain Guy
90bd18737a
Merge "Fix build"
2012-01-19 18:16:11 -08:00
Romain Guy
65447287cb
Fix build
...
Change-Id: I0e0f6a613cdad3ec075da9b84e3532dd492f0162
2012-01-19 18:15:24 -08:00
Jeff Brown
05bd7b5daf
Don't need to link to libsqlite from media JNI library.
...
Media JNI library doesn't actually use libsqlite.
Change-Id: If8017444d259779d459ef2da83119814e31454c2
2012-01-19 18:13:19 -08:00
Jeff Brown
254fba8960
Clean up SQLiteDebug natives.
...
In particular, ensure that the database is initialized.
Change-Id: Ifa69a9dfa9d008af79beadbd1a25e90d0d29e66c
2012-01-19 18:13:18 -08:00
Romain Guy
3e77e8e59c
am d2f0dcd1: Merge "Remove unused code"
...
* commit 'd2f0dcd182fbc0423d206919e81f3845fb9b8155':
Remove unused code
2012-01-19 17:44:50 -08:00
Romain Guy
d2f0dcd182
Merge "Remove unused code"
2012-01-19 17:42:10 -08:00
Romain Guy
68fc1dfce0
Remove unused code
...
Change-Id: Ife0a43f3cfe64a1e74401b10bf74d37cbeefb5af
2012-01-19 17:41:39 -08:00
Romain Guy
4adbee3784
am bad12166: Merge "Deprecate unused APIs"
...
* commit 'bad12166190a7e8087eb5db0ae8df9a4e5843fde':
Deprecate unused APIs
2012-01-19 17:37:10 -08:00
Gilles Debunne
92db51938f
Make sure text selection always starts
...
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
2012-01-19 17:36:45 -08:00
Romain Guy
bad1216619
Merge "Deprecate unused APIs"
2012-01-19 17:34:26 -08:00