Mathias Agopian
1c3654864d
Merge "fix small bug in EGL error management" into gingerbread
2010-09-22 14:15:23 -07:00
Andreas Huber
4a198dc08f
Merge "Make sure we drain the avc software decoder's output queue once we run out of input data." into gingerbread
2010-09-22 12:20:54 -07:00
Vasu Nori
d9c52a7c96
Merge "DO NOT MERGE - redo Ib5e519fb40d3191ecac06c03a844872df19f3963" into gingerbread
2010-09-22 12:10:37 -07:00
Jesse Wilson
edc1238264
Merge "Fix problem where Base64InputStream single-byte reads were unsigned." into gingerbread
2010-09-22 11:38:43 -07:00
Mike Lockwood
ab7a8ac2cf
Merge "GpsLocationProvider: Fix race condition while bringing up APN for SUPL." into gingerbread
2010-09-22 09:54:53 -07:00
Hung-ying Tyan
a5a1eb7cb8
Merge "SipService: fix thread/socket leak" into gingerbread
2010-09-22 09:35:35 -07:00
Eric Laurent
be9efe04c7
Merge "Fix broken insert reverb auto tests." into gingerbread
2010-09-22 09:34:00 -07:00
Cary Clark
f945f81265
Merge "Do not merge: clear text selection on rotate" into gingerbread
2010-09-22 08:29:12 -07:00
Jeff Brown
452598cc1e
Merge "Fix race reading input configuration during system startup." into gingerbread
2010-09-21 18:33:12 -07:00
Dan Morrill
01d038ae02
Merge "Adding new feature definitions for new sensors (barometer and gyroscope.)" into gingerbread
2010-09-21 16:59:29 -07:00
Eric Laurent
f5d7bad76a
Merge "Fix issue 2913071." into gingerbread
2010-09-21 15:55:17 -07:00
Mathias Agopian
02dafb5068
fix small bug in EGL error management
...
make sure to clear our EGL implementation's error when returning
an error from an underlying implementation
Change-Id: Ibce4726cef1f900e4c7f16002345d7a07f8cdf41
2010-09-21 15:43:59 -07:00
Jeff Brown
02a5e339d0
Merge "Looper: use pthread_once for TLS key initialization." into gingerbread
2010-09-21 15:36:06 -07:00
Jeff Brown
61a25b2490
Looper: use pthread_once for TLS key initialization.
...
Also fix a Valgrind complaint by zeroing out the entire epoll event
struct since otherwise the data field union would be partly
uninitialized (but not in a harmful way).
Change-Id: I2091ce517e87fcad7c9caf90e2c5e4854a7ca465
2010-09-21 15:26:51 -07:00
Andreas Huber
8d6044a885
Merge "This log message is codec specific." into gingerbread
2010-09-21 15:17:04 -07:00
Andreas Huber
2604c0ad95
Merge "Remove stagefright foundation's incompatible logging interface and update callsites." into gingerbread
2010-09-21 15:14:43 -07:00
Kenny Root
efed55f569
Merge "Add image creator helper script for OBBs" into gingerbread
2010-09-21 15:00:30 -07:00
Steve Howard
e29bba3165
Merge "Un-@hide ability to download without a running notification." into gingerbread
2010-09-21 14:58:05 -07:00
Adam Powell
45983b287b
Merge "Add mdpi text select anchor asset" into gingerbread
2010-09-21 14:04:13 -07:00
Mindy Pereira
13603aaaef
Merge "DO NOT MERGE Tweaked EdgeGlow to better match user expectations." into gingerbread
2010-09-21 14:04:00 -07:00
Chet Haase
18f159fb99
Merge "do not merge" into gingerbread
2010-09-21 13:42:56 -07:00
Steve Howard
76d0d482c5
Merge "Support for download manager "queue for wifi" dialogs" into gingerbread
2010-09-21 12:49:36 -07:00
Vasu Nori
da75035d23
Merge "DO NOT MERGE - use appropriate names on SQL numbers in 'adb bugreport'" into gingerbread
2010-09-21 12:22:10 -07:00
Cary Clark
205097dd3c
Merge "Do not merge : cancel text select mode when pressing back, etc." into gingerbread
2010-09-21 11:47:38 -07:00
James Dong
9d11ca7cea
Merge "Allow record to set input color format as a command line option" into gingerbread
2010-09-21 11:34:26 -07:00
Doug Zongker
ab7fb91df5
Merge "recovery just takes a filename as an argument now (do not merge)" into gingerbread
2010-09-21 11:32:01 -07:00
Neal Nguyen
5e4ddbc025
Merge "Adding more DL Manager tests." into gingerbread
2010-09-21 11:02:29 -07:00
Eric Laurent
acb57b13d7
Merge "Made audio effect control panel intents public." into gingerbread
2010-09-21 10:47:17 -07:00
Jesse Wilson
3848410fdd
Merge "Fix double-checked locking bug in LocalSocket." into gingerbread
2010-09-21 10:30:39 -07:00
James Dong
f65d7c0669
Merge "Another attempt for fixing AAC+/eAAC+ related issue" into gingerbread
2010-09-21 10:19:22 -07:00
Mike Lockwood
a59fba9eac
Merge "SystemUI: Use new USB notifications to detect USB disconnect." into gingerbread
2010-09-21 08:45:34 -07:00
Robert Greenwalt
2d1b598549
Merge "Inet status bug fix" into gingerbread
2010-09-21 08:06:15 -07:00
Dianne Hackborn
cf93d7e873
Merge "Fix issue #2999757 : "Application Redirected" dialogue showing up erratically" into gingerbread
2010-09-21 00:24:23 -07:00
Dianne Hackborn
e228f82f6a
Merge "Fix #2999258 : ANR in Settings after every reboot" into gingerbread
2010-09-20 22:19:47 -07:00
Chung-yih Wang
4e89ce3f98
Merge "Revert the ANSWERING state." into gingerbread
2010-09-20 22:04:57 -07:00
Robert Greenwalt
e0fb13866e
Merge "Add Inet Condition log to bugreports" into gingerbread
2010-09-20 21:29:02 -07:00
Irfan Sheriff
b98e0dd728
Merge "DO NOT MERGE Enable debug in StatusBarService" into gingerbread
2010-09-20 19:51:39 -07:00
Mike Lockwood
abbf805c91
Merge "LocationManager: Hide location provider and geocode provider APIs." into gingerbread
2010-09-20 17:16:03 -07:00
Dianne Hackborn
2f516cddac
Merge "DO NOT MERGE. Wifi service now blames apps for its wake lock use." into gingerbread
2010-09-20 17:03:15 -07:00
Dianne Hackborn
6473500135
Merge "In theory the package manager now scans /vendor/app" into gingerbread
2010-09-20 16:54:22 -07:00
Scott Main
37f2d1a005
am 73e150c8: provide link to backup guide above the fold
...
Merge commit '73e150c886afc6cd92e8b065a58d61e0b2a098ed' into gingerbread
* commit '73e150c886afc6cd92e8b065a58d61e0b2a098ed':
provide link to backup guide above the fold
2010-09-20 16:37:32 -07:00
Dianne Hackborn
95ca338d1a
Merge "Some battery improvements:" into gingerbread
2010-09-20 16:29:42 -07:00
Steve Howard
642b2d271d
Merge "New error status for "destination file already exists"." into gingerbread
2010-09-20 15:40:41 -07:00
John Wang
6a9165006d
Merge "Use PhoneBase in the phone list." into gingerbread
2010-09-20 15:35:02 -07:00
Brian Swetland
ef7b152fad
Merge "support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl" into gingerbread
2010-09-20 14:05:25 -07:00
Brian Swetland
2b9e4f6a24
support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl
...
Change-Id: Idd9ca85ce3ba6c92234375071b53e5365e689062
2010-09-20 12:58:15 -07:00
Hung-ying Tyan
ad50813521
Merge "SIP: add config flag for wifi-only configuration." into gingerbread
2010-09-19 18:02:13 -07:00
Adam Powell
1f6bf40676
Merge "Fix some drawing artifacts/bugs around overlays/text anchors" into gingerbread
2010-09-17 19:15:38 -07:00
Jeff Brown
1396874273
Merge "Reduce lock thrashing in native Looper." into gingerbread
2010-09-17 17:26:02 -07:00
Jeff Brown
ed242de3f5
Reduce lock thrashing in native Looper.
...
In the common case, there is nothing interesting happening on the native
Looper besides occasional wake ups. There is no point grabbing the
semaphore then.
Change-Id: Ib5c426d0e158dfa37891b7ff5537b6f833592fad
2010-09-17 17:01:23 -07:00
