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
Brad Fitzpatrick
eeaba93ead
Merge "DropBox.Entry javadoc syntax fix" into gingerbread
2010-10-07 10:20:32 -07:00
John Wang
544dd8158b
Merge "Add flag to skip restoring network seletion." into gingerbread
2010-10-07 09:47:01 -07:00
Eric Rowe
353d0832fc
Merge "DO NOT MERGE Initialize bluetooth profiles in BT stress tests" into gingerbread
2010-10-07 09:06:30 -07:00
Wink Saville
0e918d5345
Merge "Changed handling of onQueryCompelete to not use mimeType." into gingerbread
2010-10-07 08:34:01 -07:00
Wu-cheng Li
3c2dc49b88
Merge "Add javadoc for display orientation." into gingerbread
2010-10-07 05:49:27 -07:00
Hung-ying Tyan
6a046de26f
Merge "Make SipService broadcast SIP_SERVICE_UP when it's up." into gingerbread
2010-10-06 23:11:09 -07:00
Eric Fischer
3237326c9d
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2010-10-06 17:32:17 -07:00
Xavier Ducrohet
32bafef825
Merge "Parser is optional in obtainStyledAttributes." into gingerbread
2010-10-06 17:32:10 -07:00
Hung-ying Tyan
bca588d6fc
Merge "SIP: Fix busy authentication loop." into gingerbread
2010-10-06 17:29:28 -07:00
Dianne Hackborn
98fd36fe24
Merge "Make Activity.removeDialog() less strict." into gingerbread
2010-10-06 17:26:16 -07:00
Kenny Root
a135d25422
Merge "Add MountService tests and fix a bug it found" into gingerbread
2010-10-06 16:59:23 -07:00
Dianne Hackborn
84a43e7e1c
Merge "Work on issue #3062691 : GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider" into gingerbread
2010-10-06 16:56:02 -07:00
Dianne Hackborn
f1598c5442
Merge "Make USB mass storage hide keyguard when shown." into gingerbread
2010-10-06 11:19:51 -07:00
Chung-yih Wang
6bc2795c1c
Merge "Misc fixes for sim-eng build." into gingerbread
2010-10-06 01:50:25 -07:00
Fred Chung
9211b05c40
am 30264c9b: Merge "Doc change: Adding new docs for Device Admin API." into froyo
...
Merge commit '30264c9b85109ae58c1e472a747bf47464cc1632' into gingerbread
* commit '30264c9b85109ae58c1e472a747bf47464cc1632':
Doc change: Adding new docs for Device Admin API.
2010-10-05 23:39:23 -07:00
Fred Chung
0a95ad1e3b
Merge "Doc change: Adding new docs for Device Admin API." into froyo
2010-10-05 23:26:41 -07:00
Dianne Hackborn
544360db82
Merge "Fix NPE if there is no accelerometer." into gingerbread
2010-10-05 19:02:52 -07:00
Dianne Hackborn
736a4e9d21
Merge "Fix issue #3001368 : API REVIEW: android.app.Activity" into gingerbread
2010-10-05 18:56:54 -07:00