64640 Commits

Author SHA1 Message Date
Robert Ly
a551feefa5 am ab8f1ba0: am 12310ee8: am 9575a1ab: Merge "docs: wifi direct" into ics-mr0
* commit 'ab8f1ba0ec9d66db2f653b08f4caa24a27b3a996':
  docs: wifi direct
2012-01-20 15:52:07 -08:00
Jim Miller
d3fe9abfb9 am ab9601cd: am 230a7092: Merge "Fix 5863053: Add method to lock screen immediately." into ics-mr1
* commit 'ab9601cdbb95ae94088750eff9a926a572c1a4d6':
  Fix 5863053: Add method to lock screen immediately.
2012-01-20 15:48:21 -08:00
Glenn Kasten
865534a0e3 Merge "Fix warning for redundant typedef" 2012-01-20 15:06:01 -08:00
Glenn Kasten
0a204ed0f5 Use audio_format_t consistently, continued
Was int or uint32_t.

When AudioFlinger::format can't determine the correct format,
return INVALID rather than DEFAULT.

Init mFormat to INVALID rather than DEFAULT in the constructor.
Subclass constructors will set mFormat to the correct value.

Change-Id: I9b62640aa107d24d2d27925f5563d0d7407d1b73
2012-01-20 14:41:34 -08:00
Robert Greenwalt
2772143eff Merge "Stop using shared DUN APN when tethering stops." 2012-01-20 14:35:41 -08:00
Eino-Ville Talvala
59734cb7ca Merge "Add ANativeWindow timestamp support to camera service." 2012-01-20 14:32:22 -08:00
Robert Greenwalt
67d853b61a Merge "Log netd traffic nicely." 2012-01-20 14:24:15 -08:00
Jeff Brown
1bf599a01e Merge "Initialize SQLite as part of the android runtime." 2012-01-20 14:07:59 -08:00
Gilles Debunne
2f9510ca50 Merge "Touch moves cursor in text refactored" 2012-01-20 14:06:19 -08:00
Andreas Huber
e8bb6fef58 Merge "Starhub RTSP apparently does not establish time on all tracks" 2012-01-20 13:43:39 -08:00
Andreas Huber
475334f7bd Starhub RTSP apparently does not establish time on all tracks
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
2012-01-20 13:30:03 -08:00
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
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
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
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
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
Glenn Kasten
7524a59252 Merge "Remove dead setRingerMode(mode, mask)" 2012-01-20 10:07:06 -08:00
Glenn Kasten
1b4d60497c Merge "Fix build warning for void * arithmetic" 2012-01-20 08:32:45 -08:00
Pin Ting
f17e7c272e Merge "Fixes some javadoc." 2012-01-20 01:37:12 -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
20c53cb3aa Merge "Remove obsolete TODO comments" 2012-01-19 18:53:27 -08:00
Romain Guy
22d418437e Fix the build, for real
Change-Id: I6263f7e5e3ae2f7efe045f8b464c0ed1b87fc793
2012-01-19 18:33:25 -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
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
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
Romain Guy
f9d9c065ed Deprecate unused APIs
Change-Id: I0107e246b632dda96b8b025217936954f1f46283
2012-01-19 17:16:38 -08:00
James Dong
e1103cfc78 Remove obsolete TODO comments
Change-Id: Ie2353f11c4bbea5699cf9b824bb4b6aa113e3472
2012-01-19 17:14:16 -08:00
Jeff Brown
48a4789686 Remove custom SQLITE_UNCLOSED error code.
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
2012-01-19 16:39:03 -08:00
Andreas Huber
fa78fe0d70 Merge "Make sure the ThrottledSource reports the proper mime type" 2012-01-19 14:40:44 -08:00
Jeff Brown
a6885fa366 Merge "Remove no longer needed EventHub usleep() optimization." 2012-01-19 14:19:28 -08:00
Gilles Debunne
004b02d626 Touch moves cursor in text refactored
Code was moved back from the movement method to the touch event code in TextView.

Change-Id: I7dc0d957554ddce08e810d20e0385f98802ef1a4
2012-01-19 14:18:17 -08:00
Andreas Huber
efbeb9b402 Make sure the ThrottledSource reports the proper mime type
of the underlying source.

Change-Id: I7cfd5c9f10d4b07781ed82fbdc9bf3db2e86cf84
2012-01-19 14:17:49 -08:00
Jeff Brown
214f459b2c Remove no longer needed EventHub usleep() optimization.
This optimization is no longer needed now that the kernel evdev
driver's poll() implementation only wakes up the poll after
the final sync.

Change-Id: If237776861df9cfac3086e744d3bbf3484d4c53b
2012-01-19 14:16:09 -08:00
Jeff Brown
ea33f4bca5 Merge "Fix line wrapping." 2012-01-19 14:11:47 -08:00
Jeff Brown
4130554b45 Fix line wrapping.
Change-Id: I41199d1145d2435eee046a7e5006dcdce0986821
2012-01-19 14:08:48 -08:00
Jeff Brown
3e8d7cfd1e Merge "Clean up SQLite debugging code." 2012-01-19 14:05:39 -08:00
Jeff Brown
2a293b61cb Clean up SQLite debugging code.
Deleted a bunch of dead / useless code.
Raised number of logged operations in dumpsys dbinfo to 20.

Change-Id: I88344ff57a978f200c1f0172141d91e430caa1a9
2012-01-19 14:02:22 -08:00
Xavier Ducrohet
cd836bbb8b Merge "Fix broken drawCircle LayoutLib." 2012-01-19 13:17:43 -08:00