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
Jeff Brown
dc4c5bf55a
Revert to using epoll_wait().
...
This change depends on the kernel having been patched to use hrtimers
instead of jiffies for scheduling epoll timeouts.
Change-Id: I216bc1c4f565e67ebcb3d2ba4280cb615932bb9e
2010-10-07 16:17:57 -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
Hung-ying Tyan
824bf846ca
Merge "CallManager/SipPhone: fix reject a ringing call" into gingerbread
2010-10-05 18:33:22 -07:00
Gilles Debunne
ae6260ea5e
Merge "Fix for IndexOutOfBounds in text pasting." into gingerbread
2010-10-05 18:11:09 -07:00
Eric Laurent
2732651b34
Merge "Fixed AudioFlinger not always pausing tracks" into gingerbread
2010-10-05 17:06:16 -07:00
Adam Powell
dd81078e6c
Merge "DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll" into gingerbread
2010-10-05 16:39:24 -07:00
Dianne Hackborn
0202e358cf
Merge "Fix issue #3056500 : Problem report for ASTRO" into gingerbread
2010-10-05 14:42:04 -07:00
Joe Onorato
ade00a09c4
Merge "PowerManagerService needs yet another flag..." into gingerbread
2010-10-05 14:41:16 -07:00
Andreas Huber
ec2c1c8d2c
Merge "Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out." into gingerbread
2010-10-05 14:09:32 -07:00
Kenny Root
2daafa5af9
Merge "Remove lingering system app native libs in /data" into gingerbread
2010-10-05 14:04:26 -07:00
Jeff Brown
1a727bd085
Merge "Make secure views tolerate IME overlays." into gingerbread
2010-10-05 13:06:05 -07:00
Kenny Root
0f85f28b21
Merge "Get correct native library path on reinstall" into gingerbread
2010-10-05 12:48:46 -07:00
Dianne Hackborn
d39316d69e
Merge "DO NOT MERGE: Get rid of status bar's dim during night." into gingerbread
2010-10-05 12:48:40 -07:00
Mike Lockwood
5bf21bce37
Merge changes Ic5551c94,I0207f7f7 into gingerbread
...
* changes:
GPS: Clean up GPS API extension initialization in JNI code.
GPS: Add support for AGpsRilInterface.
2010-10-05 12:36:34 -07:00
Jeff Brown
35cf0e9854
Make secure views tolerate IME overlays.
...
Change-Id: I3cf09b9d91045f4d9c558b4aace482a7b0bbd3d8
2010-10-05 12:26:23 -07:00
Robert Greenwalt
3a6f070d32
Merge "Add supporting MCC=450(Korea)" into gingerbread
2010-10-05 11:46:12 -07:00