Chia-chi Yeh
5be7524e14
Merge "AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead." into gingerbread
2010-09-28 21:11:27 -07:00
Mike Lockwood
a9bb401223
Merge "Revert "Check for the DEVICE_POWER permission in userActivity."" into gingerbread
2010-09-28 20:15:55 -07:00
Chia-chi Yeh
e708b34802
Merge changes Iae1913fb,I38dbefef into gingerbread
...
* changes:
RTP: Enable GSM codec.
RTP: Refactor out G711 codecs into another file.
2010-09-28 19:40:59 -07:00
Dianne Hackborn
ef3021c20e
Merge "Remove old location classes." into gingerbread
2010-09-28 18:16:58 -07:00
Joe Onorato
12fac3a5c9
Merge "Check for the DEVICE_POWER permission in userActivity." into gingerbread
2010-09-28 17:19:37 -07:00
Joe Onorato
7d24892adf
Merge "Fix 3041579 overscroll effect in notification area looks strange" into gingerbread
2010-09-28 17:18:59 -07:00
Dianne Hackborn
254117d2f6
Merge "Add location shared library for location provider APIs." into gingerbread
2010-09-28 17:12:44 -07:00
Eric Laurent
8b810064c2
Merge "Fix several audio effects problems." into gingerbread
2010-09-28 16:38:22 -07:00
Ying Wang
cb736594bb
Merge "Call functions to calculate deps and classes.jar" into gingerbread
2010-09-28 15:06:10 -07:00
Chia-chi Yeh
7e70f6df88
Merge "RTP: Delay the initialization of AudioTrack and AudioRecord." into gingerbread
2010-09-28 14:41:18 -07:00
Jeff Brown
adf739abc4
Merge "Fix bug in split touches." into gingerbread
2010-09-28 13:27:37 -07:00
Jeff Brown
1c32258443
Fix bug in split touches.
...
Change-Id: I808c2201a06938f82817058059f4ddcc9b1a9ae2
2010-09-28 13:26:42 -07:00
Andreas Huber
a29b78b612
Merge "Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content." into gingerbread
2010-09-28 13:23:26 -07:00
Hung-ying Tyan
ce6a06d54e
Merge "SIP: Feedback any provisional responses in addition to RING" into gingerbread
2010-09-28 13:00:38 -07:00
Gilles Debunne
3ff47bdcf9
Merge "New assets. DO NOT MERGE>" into gingerbread
2010-09-28 12:56:54 -07:00
jsh
68f2073783
Merge "Add line break between PLMN and SPN in windowshade." into gingerbread
2010-09-28 12:44:47 -07:00
Steve Howard
1277bed788
Merge "Move DownloadManager to android.app (DO NOT MERGE)" into gingerbread
2010-09-28 12:38:15 -07:00
Andreas Huber
f3b1fab582
Merge "Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens." into gingerbread
2010-09-28 12:02:35 -07:00
Andreas Huber
8a5b141433
Merge "Vorbis files may have more samples encoded that should be used, i.e. we have to trim samples at the end of the stream. This is crucial for proper looping of some audio files." into gingerbread
2010-09-28 11:46:41 -07:00
Andreas Huber
e8d14e3a9f
Merge "Squashed commit of the following:" into gingerbread
2010-09-28 11:27:33 -07:00
Dianne Hackborn
e640c7bb94
Merge "Fixes to granting URI permissions - take into account path perms." into gingerbread
2010-09-28 11:21:27 -07:00
Andy Stadler
a31234bb9f
Merge "Allow touch events when clickable *or* longClickable" into gingerbread
2010-09-28 09:26:49 -07:00
Dave Sparks
b4a76a3249
Merge "Fix media.player dumpsys to output open/mapped files correctly. Bug 2866669. The dump function whitelists several directories as filters to the output. The mount point changed for SD card in Froyo, and we started filtering files that were open on the SD card. This fix changes the filter for the SD card, and adds the directory for data files as well." into gingerbread
2010-09-28 08:44:39 -07:00
Jeff Brown
ced8172ac1
Merge "Fix pointer index when splitting secondary pointers." into gingerbread
2010-09-27 20:57:02 -07:00
Jeff Brown
ffb16d601b
Fix pointer index when splitting secondary pointers.
...
Change-Id: Ib01e810ea5b64501b1303000bbef0f0a1db2114e
2010-09-27 20:54:28 -07:00
Hung-ying Tyan
813ccddc02
Merge "Don't enter DISCONNECTING state when the call/connection is not alive" into gingerbread
2010-09-27 19:23:35 -07:00
Hung-ying Tyan
6e0e4c4f11
Merge "Move SipService out of SystemServer to phone process." into gingerbread
2010-09-27 16:25:49 -07:00
Gilles Debunne
eec02f9bad
Merge "Updated assets in status bar. DO NOT MERGE." into gingerbread
2010-09-27 16:07:47 -07:00
Nick Kralevich
fe5e2b58c3
Merge "squeeze a few more bits of randomness into /dev/random" into gingerbread
2010-09-27 15:23:45 -07:00
Eric Fischer
5e9c93e6e4
Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread
2010-09-27 15:01:33 -07:00
Gilles Debunne
4b21b13986
Merge "Revert previous status bar assets. DO NOT MERGE." into gingerbread
2010-09-27 14:26:56 -07:00
Wu-cheng Li
674166e6fc
Merge "The old overlay should be destroyed if orientation changes." into gingerbread
2010-09-27 14:09:02 -07:00
Kenny Root
6569e8fb44
Merge "Use buffered I/O during certificate parsing" into gingerbread
2010-09-27 12:45:44 -07:00
Dianne Hackborn
7a0090f88a
Merge "Allow all apps to call ContentResolver.getType()." into gingerbread
2010-09-27 12:42:34 -07:00
Jeff Brown
6949f5da66
Merge "Add suuport for splitting touch events across windows." into gingerbread
2010-09-27 12:33:14 -07:00
Joe Onorato
257fe6b330
Merge "We only need at most one tty icon." into gingerbread
2010-09-27 11:41:24 -07:00
Joe Onorato
567e7e0a69
Merge "If an icon add remove get coalesced, don't remove some other icon." into gingerbread
2010-09-27 11:40:15 -07:00
Hung-ying Tyan
5aac807823
Merge "SipAudioCall: remove SipManager dependency." into gingerbread
2010-09-27 10:54:27 -07:00
Dan Morrill
9420e797f9
Merge "Adding a feature to indicate that the device possesses low-latency audio. The specific criteria for low-latency audio are defined in the CDD, but since that hasn't yet been settled for Gingerbread, this change doesn't go into details. We can do a docs change later once GB CDD is final." into gingerbread
2010-09-27 10:30:41 -07:00
James Dong
ac06987ae2
Merge "Fix track duration calculation if the start timestamp is non-zero" into gingerbread
2010-09-27 10:08:52 -07:00
Andreas Huber
c32b23674a
Merge "Support other kinds of HTTP redirect in NuHTTPDataSource" into gingerbread
2010-09-27 09:20:58 -07:00
Eric Laurent
61d5a7f8e4
Merge "Fix error in AudioEffect command status reporting." into gingerbread
2010-09-27 08:41:00 -07:00
Kenny Root
ca5eb60743
Merge "Use buffered output during packages.xml write" into gingerbread
2010-09-27 08:03:47 -07:00
Fabrice Di Meglio
1b0fe7a6dc
Merge "Fix bug #2585298 (google calendar sync clears eventTimezone field for recurring allDay events)" into gingerbread
2010-09-27 02:16:01 -07:00
Jeff Brown
d1b0a2bfe5
Add suuport for splitting touch events across windows.
...
This feature is currently used to enable dragging the start and end
selection handles of a TextView at the same time. Could be used for
other things later.
Deleted some dead code in ArrowKeyMovementMethod and CursorControllers.
Change-Id: I930accd97ca1ca1917aab8a807db2c950fc7b409
2010-09-26 22:20:12 -07:00
Mindy Pereira
70da97b0dd
Merge "DO NOT MERGE. Only 1 edge glow should be growing at a time." into gingerbread
2010-09-26 18:16:26 -07:00
Jean-Baptiste Queru
79f006b69f
reconcile froyo-release into gingerbread
...
Change-Id: I4c6d47421ed7a26b65f4f2df105d8375fcc3d840
2010-09-26 17:29:28 -07:00
John Wang
9110d71aa9
Merge "Add debug functions." into gingerbread
2010-09-26 13:53:33 -07:00
Mathias Agopian
8405dff685
Merge changes I1f7c4535,I741c68a2 into gingerbread
...
* changes:
simple test app for screen capture API
add support for [1974164] Be able to take a screen shot on the device
2010-09-24 18:02:10 -07:00
Patrick Dubroy
84b804678e
Merge "do not merge - Asset update (pass #3 )" into gingerbread
2010-09-24 16:57:46 -07:00
