Chia-chi Yeh
0588f16b56
am ab7c3245: Merge "NEW_API: Unhide RTP APIs." into honeycomb-mr1
...
* commit 'ab7c3245ed7a725406a58826382471105c725468':
NEW_API: Unhide RTP APIs.
2011-03-07 15:41:50 -08:00
Chia-chi Yeh
ab7c3245ed
Merge "NEW_API: Unhide RTP APIs." into honeycomb-mr1
2011-03-07 15:39:54 -08:00
Simon Wilson
6b6869d5c1
Merge "mms: mms wap push length check before pdu processing." into gingerbread
2011-03-07 15:39:19 -08:00
Soojung Shin
7ac1cb787c
mms: mms wap push length check before pdu processing.
...
Change-Id: Id5b5572bcd2953e496f03142d13bd2d012225e30
Signed-off-by: Soojung Shin <sj46.shin@samsung.com>
2011-03-07 15:37:01 -08:00
Adam Powell
3ba8f5d675
Fix bug 4021346 - crash while navigating
...
Change-Id: Iff60c5f4214c56597f2a1b393982d023866e490e
2011-03-07 15:36:33 -08:00
Adam Powell
81f4fdc1f4
am 6fd61629: am 43a81197: Merge "Fix bug 3501766 - Make the action bar "up" visual more prominent" into honeycomb-mr1
...
* commit '6fd61629b34881bf5c454ca4aaa7dacfe1656679':
Fix bug 3501766 - Make the action bar "up" visual more prominent
2011-03-07 15:11:54 -08:00
James Dong
b1be086e1d
am d581c047: Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch...
...
* commit 'd581c04722e2610ca5471b9c3d1881043b1205b1':
Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch...
2011-03-07 15:10:26 -08:00
Adam Powell
6fd61629b3
am 43a81197: Merge "Fix bug 3501766 - Make the action bar "up" visual more prominent" into honeycomb-mr1
...
* commit '43a811979d55587e014134f6050dc90ca918f9ce':
Fix bug 3501766 - Make the action bar "up" visual more prominent
2011-03-07 15:09:28 -08:00
Adam Powell
43a811979d
Merge "Fix bug 3501766 - Make the action bar "up" visual more prominent" into honeycomb-mr1
2011-03-07 15:06:02 -08:00
Adam Powell
8fca37ce30
Fix bug 3501766 - Make the action bar "up" visual more prominent
...
Change-Id: Id4b104dd6ca1df662479ab54f045e119585f990f
2011-03-07 14:54:48 -08:00
James Dong
d581c04722
Add missing copyright headers for a couple of files. DO NOT MERGE
...
Cherry-picked from other branch...
bug - 4025673
Change-Id: I6fd1baaf5625297fb1e358de3a3a632a7f5deb90
2011-03-07 14:50:40 -08:00
Jeff Brown
c3fe7669d6
Make PointerLocationView also log generic motions and some keys.
...
Change-Id: Ia7ec0f1a98e9eaf1c59db90b8f77a3cd4cf69625
2011-03-07 14:47:45 -08:00
James Dong
6f3489caf2
am a7c9dffd: am 4ed072f9: Merge "Add missing copyright headers to a couple of files" into honeycomb-mr1
...
* commit 'a7c9dffdb8097105482ce976ba0a51baa76d8806':
Add missing copyright headers to a couple of files
2011-03-07 14:45:51 -08:00
James Dong
a7c9dffdb8
am 4ed072f9: Merge "Add missing copyright headers to a couple of files" into honeycomb-mr1
...
* commit '4ed072f904b5344ce4ef6f832c618a1d3f43867d':
Add missing copyright headers to a couple of files
2011-03-07 14:44:02 -08:00
James Dong
4ed072f904
Merge "Add missing copyright headers to a couple of files" into honeycomb-mr1
2011-03-07 14:41:50 -08:00
James Dong
e2693e5d62
Add missing copyright headers to a couple of files
...
bug - 4025673
Change-Id: Ie1c4cf18c06032f9b89cc08e5be25d38c0f76aa1
2011-03-07 14:34:05 -08:00
Chia-chi Yeh
6defd2d47e
NEW_API: Unhide RTP APIs.
...
This change unhides RTP related classes including AudioCodec,
AudioGroup, AudioStream, and RtpStream. This allows developers
to control audio streams directly and also makes conference
calls possible with the combination of the public SIP APIs.
Change-Id: Idfd4edf65a1cbf3245ec2786fbc03b06438b0fb3
2011-03-08 05:59:09 +08:00
Leon Scroggins
ba1229ef8e
am 0645e28d: (-s ours) am 6478e4f0: Merge "New button assets for webview. DO NOT MERGE" into honeycomb-mr1
...
* commit '0645e28d5a6776578afef03a796786f3f9e9eba8':
New button assets for webview. DO NOT MERGE
2011-03-07 13:52:37 -08:00
Wink Saville
2802dda817
Merge "Remove mRetryMgr and directly use DataConnection retry mgr."
2011-03-07 13:51:11 -08:00
Leon Scroggins
0645e28d5a
am 6478e4f0: Merge "New button assets for webview. DO NOT MERGE" into honeycomb-mr1
...
* commit '6478e4f0b0a6d34251ca0125eb6067f038e344aa':
New button assets for webview. DO NOT MERGE
2011-03-07 13:49:52 -08:00
Leon Scroggins
6478e4f0b0
Merge "New button assets for webview. DO NOT MERGE" into honeycomb-mr1
2011-03-07 13:47:30 -08:00
Gloria Wang
a36d360cfb
am 57a72699: am d686c31b: Merge "To support uri started with http:// in some Java APIs Fix for bug 4016388." into honeycomb-mr1
...
* commit '57a7269965ace798992809544630d6719d84760d':
To support uri started with http:// in some Java APIs Fix for bug 4016388.
2011-03-07 13:36:27 -08:00
Mike Lockwood
2d5bb293a4
am 1cdb2929: am 11cb5cb9: Merge "MtpClient: Fix problem with getDeviceList() returning empty result in some cases" into honeycomb-mr1
...
* commit '1cdb2929f368a1ab1c30e89200e585fcb1278492':
MtpClient: Fix problem with getDeviceList() returning empty result in some cases
2011-03-07 13:36:20 -08:00
Gloria Wang
57a7269965
am d686c31b: Merge "To support uri started with http:// in some Java APIs Fix for bug 4016388." into honeycomb-mr1
...
* commit 'd686c31bf3da56378e174265889db9bca8e636a3':
To support uri started with http:// in some Java APIs Fix for bug 4016388.
2011-03-07 13:32:27 -08:00
Mike Lockwood
1cdb2929f3
am 11cb5cb9: Merge "MtpClient: Fix problem with getDeviceList() returning empty result in some cases" into honeycomb-mr1
...
* commit '11cb5cb9e322bb06c5006225e8c8ef3f7291ee96':
MtpClient: Fix problem with getDeviceList() returning empty result in some cases
2011-03-07 13:29:39 -08:00
Gloria Wang
d686c31bf3
Merge "To support uri started with http:// in some Java APIs Fix for bug 4016388." into honeycomb-mr1
2011-03-07 13:28:27 -08:00
Mike Lockwood
11cb5cb9e3
Merge "MtpClient: Fix problem with getDeviceList() returning empty result in some cases" into honeycomb-mr1
2011-03-07 13:23:40 -08:00
Leon Scroggins
69ee2688e8
New button assets for webview. DO NOT MERGE
...
Bug:3009375
Change-Id: I27fc6a62845075f4a5f5708ef0a12dd928b12403
2011-03-07 16:22:11 -05:00
Eric Fischer
e421c63f79
am 48eb658b: (-s ours) am c5f7f582: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit '48eb658bd9eedf0ef0e03613a21604e238cb0360':
Import revised translations. DO NOT MERGE
2011-03-07 13:17:56 -08:00
Eric Fischer
48eb658bd9
am c5f7f582: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit 'c5f7f582a6b7632c34270a9d1edb04bc4b7e2640':
Import revised translations. DO NOT MERGE
2011-03-07 13:07:58 -08:00
Eric Fischer
c5f7f582a6
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-07 13:03:44 -08:00
Vasu Nori
670e5ddfa6
am f114e67e: am 0f73fe1c: Merge "bug:3513950 Rename "completedDownload" to "addCompletedDownload"" into honeycomb-mr1
...
* commit 'f114e67edd85e874b54f0a7061addf4b43d35076':
bug:3513950 Rename "completedDownload" to "addCompletedDownload"
2011-03-07 12:55:38 -08:00
Eric Fischer
e5d97c7fde
Import revised translations. DO NOT MERGE
...
Change-Id: Id71f94e856fb7e4cbc9b24ff6afa9085b0e03244
2011-03-07 12:53:42 -08:00
Vasu Nori
f114e67edd
am 0f73fe1c: Merge "bug:3513950 Rename "completedDownload" to "addCompletedDownload"" into honeycomb-mr1
...
* commit '0f73fe1c847f260d52675ffc1ef54b6daf136772':
bug:3513950 Rename "completedDownload" to "addCompletedDownload"
2011-03-07 12:51:50 -08:00
Vasu Nori
0f73fe1c84
Merge "bug:3513950 Rename "completedDownload" to "addCompletedDownload"" into honeycomb-mr1
2011-03-07 12:46:59 -08:00
Dianne Hackborn
db773c5572
Fix issue #3515088 : Don't be so aggressive trying to reclaim memory
...
Change-Id: I8184306fa8c27a41b8bcfcad8d96985be8f0c9aa
2011-03-07 11:57:33 -08:00
Patrick Dubroy
c3549dd49b
am aca79826: am 19960989: Merge "Remove guard preventing onDetachedFromWindow() from being called" into honeycomb-mr1
...
* commit 'aca79826484ee8eaaae42beabe1b21fdc5fbbab7':
Remove guard preventing onDetachedFromWindow() from being called
2011-03-07 11:56:42 -08:00
Patrick Dubroy
aca7982648
am 19960989: Merge "Remove guard preventing onDetachedFromWindow() from being called" into honeycomb-mr1
...
* commit '19960989e2c5ad60e4d05ebb3b31bc25ecd751af':
Remove guard preventing onDetachedFromWindow() from being called
2011-03-07 11:54:22 -08:00
Jeff Brown
3cc75247ea
am fd47c5ee: (-s ours) am f0210c36: Merge "Joystick tweaks. (DO NOT MERGE)" into honeycomb-mr1
...
* commit 'fd47c5eea2a4393b5c9897bb80db721809146aaf':
Joystick tweaks. (DO NOT MERGE)
2011-03-07 11:52:07 -08:00
Patrick Dubroy
19960989e2
Merge "Remove guard preventing onDetachedFromWindow() from being called" into honeycomb-mr1
2011-03-07 11:51:50 -08:00
Vasu Nori
3728130310
bug:3513950 Rename "completedDownload" to "addCompletedDownload"
...
Change-Id: I28b33a0268309d74fd2512b5bdb599f38ff3a96d
2011-03-07 11:51:14 -08:00
Jeff Brown
fd47c5eea2
am f0210c36: Merge "Joystick tweaks. (DO NOT MERGE)" into honeycomb-mr1
...
* commit 'f0210c36218c03dc30e444ef85690dc815097920':
Joystick tweaks. (DO NOT MERGE)
2011-03-07 11:49:52 -08:00
Jeff Brown
f0210c3621
Merge "Joystick tweaks. (DO NOT MERGE)" into honeycomb-mr1
2011-03-07 11:47:58 -08:00
satok
8295e27007
Merge "Fix a test for system properties in frameworks/base/core"
2011-03-07 11:41:02 -08:00
satok
decee8d35b
Fix a test for system properties in frameworks/base/core
...
Change-Id: Id588d63ae4cae8c25b430c4ff7719173dacc70bb
2011-03-07 11:32:51 -08:00
Romain Guy
5a383c1f75
am 15c6b719: am 0aaa11ed: Merge "Remove many unnecessary save/restore calls." into honeycomb-mr1
...
* commit '15c6b719fe8d1f4b27b4fa66ac94eede3957caf2':
Remove many unnecessary save/restore calls.
2011-03-07 11:28:13 -08:00
Romain Guy
15c6b719fe
am 0aaa11ed: Merge "Remove many unnecessary save/restore calls." into honeycomb-mr1
...
* commit '0aaa11ed5be45170fb2535a6ce021c92b18d8878':
Remove many unnecessary save/restore calls.
2011-03-07 11:25:41 -08:00
Romain Guy
0aaa11ed5b
Merge "Remove many unnecessary save/restore calls." into honeycomb-mr1
2011-03-07 11:24:02 -08:00
Mike Lockwood
2b8a1ee057
MtpClient: Fix problem with getDeviceList() returning empty result in some cases
...
BUG: 3503128
Change-Id: I2263437d6018848e316ae4096eb07305fc4dc486
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-07 14:19:06 -05:00
Soojung Shin
3fff651497
am 3fe49d81: am fa680a18: am ff5a0990: Added to check for supporting mms content-disposition, utf8 decoding.
...
* commit '3fe49d8168ab7344d495ea5ee8ed6b9ef3145495':
Added to check for supporting mms content-disposition, utf8 decoding.
2011-03-07 11:16:07 -08:00