Irfan Sheriff
ba18dd9fa9
Merge "fix getmacaddress race condition (don't auto-merge)" into gingerbread
2010-10-10 12:21:51 -07:00
John Wang
46e92cb3d3
Merge "Fix startDtmf." into gingerbread
2010-10-10 11:38:39 -07:00
Gilles Debunne
c486fcc633
Merge "Made paste work in ExtractEditText" into gingerbread
2010-10-10 10:51:52 -07:00
Mike Lockwood
04d921fa29
Merge "GPS: Do not call sGpsInterface->init() multiple times" into gingerbread
2010-10-09 17:15:54 -07:00
Chung-yih Wang
ea01cfbb53
Merge "Do not release the wifi lock if the screen is off." into gingerbread
2010-10-08 23:25:11 -07:00
Scott Main
e60bb383aa
am 456fe3b3: add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
...
Merge commit '456fe3b337ef82aaf90c6428ec5be07028fc7d15' into gingerbread
* commit '456fe3b337ef82aaf90c6428ec5be07028fc7d15':
add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
2010-10-08 17:27:28 -07:00
Gilles Debunne
c91355b2b7
Merge "Other improvements to text cursor movement." into gingerbread
2010-10-08 17:14:45 -07:00
Mindy Pereira
e0af18ecb6
Merge "DO NOT MERGE Limit the height of the pull glow." into gingerbread
2010-10-08 17:10:21 -07:00
Scott Main
1965b2da51
am 50f86c65: docs: a few style adjustments to admin doc
...
Merge commit '50f86c65206072be0ca924f03b8d460365199bcd' into gingerbread
* commit '50f86c65206072be0ca924f03b8d460365199bcd':
docs: a few style adjustments to admin doc
2010-10-08 16:39:08 -07:00
Scott Main
a0f02af69d
am 2e5a22aa: docs: remove old "new" tags from side nav
...
Merge commit '2e5a22aa3cd9ca81c82e93044dca6f36c395746d' into gingerbread
* commit '2e5a22aa3cd9ca81c82e93044dca6f36c395746d':
docs: remove old "new" tags from side nav
2010-10-08 16:30:47 -07:00
Andreas Huber
313ecd5352
Merge "RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams." into gingerbread
2010-10-08 15:49:48 -07:00
Scott Main
08302f0a0f
am 65e62f4f: docs: new web apps dev guides
...
Merge commit '65e62f4f908394fc469cf535fef7c16035a428a2' into gingerbread
* commit '65e62f4f908394fc469cf535fef7c16035a428a2':
docs: new web apps dev guides
2010-10-08 15:43:44 -07:00
Brad Fitzpatrick
8623f94279
Merge "Minor SharedPreference clean-up." into gingerbread
2010-10-08 15:35:45 -07:00
Dianne Hackborn
9c331df44c
Merge "Fix retaining of granted permissions when updating of system app." into gingerbread
2010-10-08 15:21:49 -07:00
Dianne Hackborn
292ec505a3
Merge "Maybe fix #3076572 : phone process crashes in SipService, trying to get wifi lock" into gingerbread
2010-10-08 15:09:23 -07:00
Steve Howard
ef74539961
Merge "Update DownloadManager API to support bulk actions." into gingerbread
2010-10-08 14:42:43 -07:00
Gilles Debunne
31a7f2409b
Merge "TextView cursor and selection improvements." into gingerbread
2010-10-08 14:42:42 -07:00
Dianne Hackborn
51861cda0e
Merge "Fix issue #3074745 : Crash in system process" into gingerbread
2010-10-08 14:05:01 -07:00
Brad Fitzpatrick
6dd8eec818
Merge "DropBoxManager.Entry implements Closeable" into gingerbread
2010-10-08 12:59:30 -07:00
Andreas Huber
1b66c4aca7
Merge "Refactor some more h.264 utility code out into avc_utils. Work around a hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR." into gingerbread
2010-10-08 12:51:31 -07:00
Jeff Brown
6ce23c4c8e
Merge "Clarify some comments on individual key codes." into gingerbread
2010-10-08 12:44:43 -07:00
Mike Lockwood
7bfdae64bd
Merge "Remove races in Geocoder/LocationProvider Proxy" into gingerbread
2010-10-08 11:17:17 -07:00
Andreas Huber
5d372aabe4
Merge "Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality." into gingerbread
2010-10-08 11:16:07 -07:00
Andreas Huber
ef072a1f4b
Merge "Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams." into gingerbread
2010-10-08 10:59:52 -07:00
James Dong
b2df56fcf6
Merge "Name the writer threads" into gingerbread
2010-10-08 10:06:22 -07:00
Andreas Huber
3389b28cd0
Merge "Disable the access unit timeout temporarily while a seek operation is in progress." into gingerbread
2010-10-08 10:01:37 -07:00
Gilles Debunne
285bb1b8ab
Merge "Long press with trackball selects word under cursor." into gingerbread
2010-10-08 09:22:29 -07:00
Eric Laurent
740f0561f2
Merge "Added getter for session Id to AudioSink" into gingerbread
2010-10-08 08:28:08 -07:00
Andreas Huber
fc85f3a7f4
Merge "Increase scratch buffers sizes in mp3 software decoder, this integrates a PV master/opensource patch." into gingerbread
2010-10-08 08:02:42 -07:00
Chung-yih Wang
7d7daee5fa
Merge "SipService: add permission check for using API" into gingerbread
2010-10-07 21:28:23 -07:00
Marco Nelissen
8950fabfbc
am ef5afa07: (-s ours) Do not merge. Don\'t crash when extra logging is enabled.
...
Merge commit 'ef5afa073b4a8c80ac5f28ccc02e1d0b42b1560f' into gingerbread
* commit 'ef5afa073b4a8c80ac5f28ccc02e1d0b42b1560f':
Do not merge.
2010-10-07 17:48:46 -07:00
Kenny Root
ddfbafa786
Merge "Symlink application lib directory when on SD card" into gingerbread
2010-10-07 17:38:44 -07:00
Hung-ying Tyan
ed1076e47e
Merge "Use explicit intent for installing credentials." into gingerbread
2010-10-07 17:27:28 -07:00
Gilles Debunne
313b09d0af
Merge "TextView refactoring to ease future merges in HC." into gingerbread
2010-10-07 17:18:59 -07:00
Jaikumar Ganesh
36150e99a4
Merge "DO NOT MERGE: Disconnect PBAP while disconnecting HFP profile." into gingerbread
2010-10-07 16:56:06 -07:00
Mindy Pereira
4073b9e1cf
Merge "DO NOT MERGE Only show edge glow effect on 1 side at a time." into gingerbread
2010-10-07 15:54:51 -07:00
Jeff Brown
86638ad353
Merge "Minor fix for InputReader support for non-touchscreen devices." into gingerbread
2010-10-07 14:35:38 -07:00
Mindy Pereira
92e711132b
Merge "DO NOT MERGE Only show edge glow effect on 1 side at a time." into gingerbread
2010-10-07 14:23:29 -07:00
Xia Wang
782cf703b8
Merge "Port mock ril controller and tests to GB. DO NOT MERGE" into gingerbread
2010-10-07 14:04:12 -07:00
Gilles Debunne
612a80bfbe
Merge "Removing 'last' of red cross asset." into gingerbread
2010-10-07 13:53:16 -07:00
Jeff Brown
77e26fce8e
Minor fix for InputReader support for non-touchscreen devices.
...
Change-Id: I2256e37dd1c6f3836f82786aae14ee5d0c98f4c6
2010-10-07 13:44:51 -07:00
Jeff Brown
95cefd9bdc
Merge "Switch Looper back to using poll() instead of epoll()." into gingerbread
2010-10-07 13:29:56 -07:00
Jeff Brown
54e1cdacd2
Switch Looper back to using poll() instead of epoll().
...
Added a couple of micro-optimizations to avoid calling wake() unnecessarily
and reduce JNI overhead slightly.
Fixed a minor issue where we were not clearing the "next" field of Messages
returned by the MessageQueue so the Message would hold on to its successor
and potentially prevent the GC from collecting it if the message were leaked
somehow.
Change-Id: I488d29417ce0cdd7d0e447cda76ec978ef7f811c
2010-10-07 13:26:39 -07:00
Andreas Huber
d62a1d5c82
Merge "Work to support switching transport streams mid-stream and signalling discontinuities to the decoder." into gingerbread
2010-10-07 11:59:53 -07:00
Justin Ho
ae527c34f4
Merge "Fixed popup assets (background)" into gingerbread
2010-10-07 11:56:18 -07:00
Adam Powell
a0de478b0e
Merge "Fix bug 3071869 - text anchors are now treated as application sub-panels." into gingerbread
2010-10-07 11:32:49 -07:00
Brad Fitzpatrick
42ea1611dd
Merge "Quiet unnecessary debug logging." into gingerbread
2010-10-07 11:27:56 -07:00
Andreas Huber
14fc691358
Merge "On this particular device the hardware video decoder spits out buffers that don't actually contain our video data, so we cannot use them to restore the video frame after suspend/resume." into gingerbread
2010-10-07 10:57:32 -07:00
Kenny Root
707191f60a
Merge "Eliminate MCS_GIVE_UP state" into gingerbread
2010-10-07 10:54:14 -07:00
Gilles Debunne
01bb31e340
Merge "Removed unused and broken screen_progress" into gingerbread
2010-10-07 10:52:11 -07:00
