Jesse Wilson
6f31b8c058
am 102930a0: Merge "Remove deprecated and unused entryEvicted method." into honeycomb-mr1
...
* commit '102930a0deaf8280a65321de0d6c120a638da9e2':
Remove deprecated and unused entryEvicted method.
2011-03-07 23:25:52 -08:00
Jesse Wilson
102930a0de
Merge "Remove deprecated and unused entryEvicted method." into honeycomb-mr1
2011-03-07 23:23:36 -08:00
Romain Guy
d00353fe31
am bc8a8e8c: Merge "Add support for partial invalidates in WebView Bug #3461349 " into honeycomb-mr1
...
* commit 'bc8a8e8c926115cb7b3910d016e5cff12b0f7b0a':
Add support for partial invalidates in WebView Bug #3461349
2011-03-07 22:43:02 -08:00
Romain Guy
bc8a8e8c92
Merge "Add support for partial invalidates in WebView Bug #3461349 " into honeycomb-mr1
2011-03-07 22:40:27 -08:00
Mike Lockwood
bd3d019cc6
am 823f5bf3: Merge "MTP: Use SharedPreferences for MTP device properties rather than sqlite3" into honeycomb-mr1
...
* commit '823f5bf3db8b2f588ae917aaff5d27a65c87f132':
MTP: Use SharedPreferences for MTP device properties rather than sqlite3
2011-03-07 20:06:37 -08:00
Mike Lockwood
823f5bf3db
Merge "MTP: Use SharedPreferences for MTP device properties rather than sqlite3" into honeycomb-mr1
2011-03-07 20:04:23 -08:00
Santosh Madhava
5893b453fc
am 0e8dc72d: Merge "Fix for issue 3453519: (Java/JNI) do not allow editing of DRM protected contents" into honeycomb-mr1
...
* commit '0e8dc72db34c0a4eb92763de4e048abc4d20f47f':
Fix for issue 3453519: (Java/JNI) do not allow editing of DRM protected contents
2011-03-07 19:45:25 -08:00
Santosh Madhava
0e8dc72db3
Merge "Fix for issue 3453519: (Java/JNI) do not allow editing of DRM protected contents" into honeycomb-mr1
2011-03-07 19:42:16 -08:00
Wink Saville
43d55c1a6e
am ff23352e: am b3c991b0: Provide default value for operator numeric for CDMA.
...
* commit 'ff23352ea70339c4230d628ab294fbf52159da06':
Provide default value for operator numeric for CDMA.
2011-03-07 18:54:19 -08:00
Wink Saville
ff23352ea7
am b3c991b0: Provide default value for operator numeric for CDMA.
...
* commit 'b3c991b0190faa4fc833a5fc9074939fd5d8a3c4':
Provide default value for operator numeric for CDMA.
2011-03-07 18:51:57 -08:00
Dianne Hackborn
78b9035b51
am 37e792d5: Merge "Fix issue #3515088 : Don\'t be so aggressive trying to reclaim memory" into honeycomb-mr1
...
* commit '37e792d53d4b38d1283960d62edcd63ef0a30e5e':
Fix issue #3515088 : Don't be so aggressive trying to reclaim memory
2011-03-07 18:21:55 -08:00
Dianne Hackborn
37e792d53d
Merge "Fix issue #3515088 : Don't be so aggressive trying to reclaim memory" into honeycomb-mr1
2011-03-07 18:20:23 -08:00
Chet Haase
79bd55ccb5
am 4bd6ccd2: Merge "Restore save/restore calls removed recently" into honeycomb-mr1
...
* commit '4bd6ccd25162a7634a90cfde72dcdc7d581d9a88':
Restore save/restore calls removed recently
2011-03-07 18:15:34 -08:00
Romain Guy
f018560cb5
am 25b81110: Merge "Fix EGL JNI bugs Bug #3461349 " into honeycomb-mr1
...
* commit '25b81110b1a4d8882727ebdb8aef523f108b53fd':
Fix EGL JNI bugs Bug #3461349
2011-03-07 18:13:27 -08:00
Chet Haase
4bd6ccd251
Merge "Restore save/restore calls removed recently" into honeycomb-mr1
2011-03-07 18:12:34 -08:00
Romain Guy
25b81110b1
Merge "Fix EGL JNI bugs Bug #3461349 " into honeycomb-mr1
2011-03-07 18:11:21 -08:00
Adam Powell
6ac23abf0e
am ad542efb: Merge "Fix bug 3506292 - Add guards against bad event streams to ScaleGestureDetector" into honeycomb-mr1
...
* commit 'ad542efb8aa241d3e576d9567f5b0979355037b3':
Fix bug 3506292 - Add guards against bad event streams to ScaleGestureDetector
2011-03-07 18:10:13 -08:00
Romain Guy
cabfcc1364
Add support for partial invalidates in WebView
...
Bug #3461349
This change also fixes two bugs that prevented partial invalidates
from working with other views. Both bugs were in our EGL implementation:
they were preventing the caller from comparing the current context/surface
with another context/surface. This was causing HardwareRenderer to always
redraw the entire screen.
Change-Id: I33e096b304d4a0b7e6c8f92930f71d2ece9bebf5
2011-03-07 18:09:03 -08:00
Adam Powell
ad542efb8a
Merge "Fix bug 3506292 - Add guards against bad event streams to ScaleGestureDetector" into honeycomb-mr1
2011-03-07 18:08:11 -08:00
Romain Guy
9b7146db6d
Fix EGL JNI bugs
...
Bug #3461349
Before this change, eglGetCurrent*() could not be used to compare
contexts, displays and surfaces at the Dalvik level.
Change-Id: I442037dae37bc357b64810ab10c779b5754e9153
2011-03-07 18:05:04 -08:00
Wink Saville
b3c991b019
Provide default value for operator numeric for CDMA.
...
If the RIL_REQUEST_OPERATOR response[2], the numeric for the operator,
is bad use the system property ro.cdma.home.operator.numeric.
bug: 3383515
Change-Id: I090e5ba0cb7e3a7f1dc08d24996e78e489b9cd41
2011-03-07 17:52:36 -08:00
Chet Haase
88172fe49c
Restore save/restore calls removed recently
...
Calls thought to be duplicates were removed, which caused rendering problems
for Browser as well as crashes in the widget list and music.
Change-Id: I6364aaa362619ea3dd368990304d61d84bbe2a90
2011-03-07 17:36:33 -08:00
Adam Powell
0818020d7c
Fix bug 3506292 - Add guards against bad event streams to ScaleGestureDetector
...
Change-Id: Id38ebb368168b7157369964e39948036405427b1
2011-03-07 16:48:29 -08:00
Adam Powell
3314a31377
am a46c1df2: Merge "Fix bug 4021346 - crash while navigating" into honeycomb-mr1
...
* commit 'a46c1df226f2aea54d3bb068b0537c9b1d28590c':
Fix bug 4021346 - crash while navigating
2011-03-07 16:27:36 -08:00
Adam Powell
a46c1df226
Merge "Fix bug 4021346 - crash while navigating" into honeycomb-mr1
2011-03-07 16:25:20 -08:00
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
Adam Powell
3ba8f5d675
Fix bug 4021346 - crash while navigating
...
Change-Id: Iff60c5f4214c56597f2a1b393982d023866e490e
2011-03-07 15:36:33 -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
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
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
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
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
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
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
Patrick Dubroy
19960989e2
Merge "Remove guard preventing onDetachedFromWindow() from being called" into honeycomb-mr1
2011-03-07 11:51:50 -08:00