Jeff Brown
fcfbe79bee
Merge "Eliminate some accidental log spam."
2011-03-08 11:58:03 -08:00
Xavier Ducrohet
00002d96b2
am 3a54f0c6: am c040eb20: Merge "LayoutLib: Fix dimension parsing to handle negative value." into honeycomb-mr1
...
* commit '3a54f0c64a709c3048bc59afcfe09afc30c31715':
LayoutLib: Fix dimension parsing to handle negative value.
2011-03-08 11:57:31 -08:00
Xavier Ducrohet
a127c2dafb
am c040eb20: Merge "LayoutLib: Fix dimension parsing to handle negative value." into honeycomb-mr1
...
* commit 'c040eb20a8e8c1bef134490d71568fe2546d0f55':
LayoutLib: Fix dimension parsing to handle negative value.
2011-03-08 11:55:00 -08:00
Xavier Ducrohet
90c4cf6a96
Merge "LayoutLib: Fix dimension parsing to handle negative value." into honeycomb-mr1
2011-03-08 11:53:04 -08:00
Irfan Sheriff
a6b206c794
Merge "Handle client loss for a full connection"
2011-03-08 11:40:25 -08:00
Mathias Agopian
d1bcd40336
am aaf2bc20: am de6a47a3: (-s ours) am df6410dc: Merge "Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) only" into gingerbread
...
* commit 'aaf2bc20f51d089c3e66149cd80deab5b0e0a6af':
Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) only
2011-03-08 11:36:46 -08:00
Mathias Agopian
4c90862481
am de6a47a3: (-s ours) am df6410dc: Merge "Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) only" into gingerbread
...
* commit 'de6a47a3e9d1a8cb5722b9785f5ffb9046c23918':
Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) only
2011-03-08 11:34:16 -08:00
Xavier Ducrohet
5f3a6955a0
am f420c1d7: am 687fe203: Merge "LayoutLib: Implement some missing add###() method in Path." into honeycomb-mr1
...
* commit 'f420c1d75a68ae9d716fe6d741af96f76dda62e0':
LayoutLib: Implement some missing add###() method in Path.
2011-03-08 11:26:55 -08:00
Xavier Ducrohet
947daf6c42
am 687fe203: Merge "LayoutLib: Implement some missing add###() method in Path." into honeycomb-mr1
...
* commit '687fe2038780aa52bc370a903b08305de4d85647':
LayoutLib: Implement some missing add###() method in Path.
2011-03-08 11:24:33 -08:00
Xavier Ducrohet
2c25c32a45
Merge "LayoutLib: Implement some missing add###() method in Path." into honeycomb-mr1
2011-03-08 11:22:46 -08:00
Wink Saville
3f9878d527
Merge "Telephony: Fix config to reflect the correct CM conn type."
2011-03-08 11:02:54 -08:00
Gilles Debunne
8940a6a5ef
am 0a301f58: am 949d0c8c: Merge "Text handles positions\' are correctly updated." into honeycomb-mr1
...
* commit '0a301f58a2b09a3c8aa083574121d21f275f62b9':
Text handles positions' are correctly updated.
2011-03-08 10:27:47 -08:00
Gilles Debunne
fc82eeb8ef
am 949d0c8c: Merge "Text handles positions\' are correctly updated." into honeycomb-mr1
...
* commit '949d0c8c384437d92fc1432b750da6da59df1fa7':
Text handles positions' are correctly updated.
2011-03-08 10:24:30 -08:00
Gilles Debunne
84ccc0395a
Merge "Removed unnecessary memory allocation in TextView."
2011-03-08 10:22:20 -08:00
Gilles Debunne
13e77d6493
Merge "Text handles positions' are correctly updated." into honeycomb-mr1
2011-03-08 10:21:54 -08:00
Leon Scroggins
131feb3085
am f279269a: am 055a8585: Merge "Do not attempt to start action mode if there is no parent." into honeycomb-mr1
...
* commit 'f279269a4c2e86092b99b67766b9fc1077f2526d':
Do not attempt to start action mode if there is no parent.
2011-03-08 09:16:34 -08:00
Leon Scroggins
5c1ff3d45e
am 055a8585: Merge "Do not attempt to start action mode if there is no parent." into honeycomb-mr1
...
* commit '055a858562e04c903988d09973accc8aeeece02c':
Do not attempt to start action mode if there is no parent.
2011-03-08 09:10:27 -08:00
Leon Scroggins
3e41059784
Merge "Do not attempt to start action mode if there is no parent." into honeycomb-mr1
2011-03-08 09:06:54 -08:00
Simon Wilson
4dfc3d1454
am 92fb1668: am 10993b2d: am 6b6869d5: Merge "mms: mms wap push length check before pdu processing." into gingerbread
...
* commit '92fb16685fd8d28b231a02bfa3ef76d3924210ad':
mms: mms wap push length check before pdu processing.
2011-03-08 08:03:55 -08:00
James Dong
4e1c794c12
am 73179134: (-s ours) am b1be086e: (-s ours) am d581c047: Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch...
...
* commit '73179134d59944a4b190c991b92b73c91fd4e0ed':
Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch...
2011-03-08 08:03:44 -08:00
Simon Wilson
9f8f474da5
am 10993b2d: am 6b6869d5: Merge "mms: mms wap push length check before pdu processing." into gingerbread
...
* commit '10993b2d1e3614073970aad119ffb2cc9bc8f73f':
mms: mms wap push length check before pdu processing.
2011-03-08 07:58:20 -08:00
James Dong
eb7a2230db
am b1be086e: (-s ours) am d581c047: Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch...
...
* commit 'b1be086e1d2f15c858b4aa7f40d49667b3e26d3a':
Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch...
2011-03-08 07:58:14 -08:00
Jesse Wilson
8d94af9b5c
am 6f31b8c0: am 102930a0: Merge "Remove deprecated and unused entryEvicted method." into honeycomb-mr1
...
* commit '6f31b8c058964ffd87da9f08fc02727bd9415e0b':
Remove deprecated and unused entryEvicted method.
2011-03-07 23:28:54 -08:00
Jesse Wilson
ee784f06fb
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
77818826b3
Merge "Remove deprecated and unused entryEvicted method." into honeycomb-mr1
2011-03-07 23:23:36 -08:00
Romain Guy
8c5cffc2e5
am d00353fe: am bc8a8e8c: Merge "Add support for partial invalidates in WebView Bug #3461349 " into honeycomb-mr1
...
* commit 'd00353fe3191571a6773ef2d11921cfcff260bc4':
Add support for partial invalidates in WebView Bug #3461349
2011-03-07 22:45:52 -08:00
Romain Guy
10955bb8f2
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
8a2a2f4689
Merge "Add support for partial invalidates in WebView Bug #3461349 " into honeycomb-mr1
2011-03-07 22:40:27 -08:00
Mike Lockwood
109d71f4f3
am bd3d019c: am 823f5bf3: Merge "MTP: Use SharedPreferences for MTP device properties rather than sqlite3" into honeycomb-mr1
...
* commit 'bd3d019cc66237c23ab0658ff80aa7923e84b239':
MTP: Use SharedPreferences for MTP device properties rather than sqlite3
2011-03-07 20:08:58 -08:00
Mike Lockwood
be30126455
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
da921a5e79
Merge "MTP: Use SharedPreferences for MTP device properties rather than sqlite3" into honeycomb-mr1
2011-03-07 20:04:23 -08:00
Santosh Madhava
21b939802f
am 5893b453: am 0e8dc72d: Merge "Fix for issue 3453519: (Java/JNI) do not allow editing of DRM protected contents" into honeycomb-mr1
...
* commit '5893b453fc762d18e759a391a442600be4924489':
Fix for issue 3453519: (Java/JNI) do not allow editing of DRM protected contents
2011-03-07 19:47:26 -08:00
Santosh Madhava
dbb597d08b
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
7b283bee52
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
4ffddc9513
am 43d55c1a: am ff23352e: am b3c991b0: Provide default value for operator numeric for CDMA.
...
* commit '43d55c1a6ea9f0cd951c197dfdc3917932e316db':
Provide default value for operator numeric for CDMA.
2011-03-07 18:56:42 -08:00
Wink Saville
e0db1feae0
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
3102b5ed0c
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
b8759993d0
am 78b9035b: am 37e792d5: Merge "Fix issue #3515088 : Don\'t be so aggressive trying to reclaim memory" into honeycomb-mr1
...
* commit '78b9035b51cd5e59500fa242952cb30ee50cddc9':
Fix issue #3515088 : Don't be so aggressive trying to reclaim memory
2011-03-07 18:24:04 -08:00
Dianne Hackborn
80b7b4b46b
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
4672f4b772
Merge "Fix issue #3515088 : Don't be so aggressive trying to reclaim memory" into honeycomb-mr1
2011-03-07 18:20:23 -08:00
Jeff Brown
50fb74e466
Merge "Support POLICY_FLAG_ALT et. al."
2011-03-07 18:19:09 -08:00
Chet Haase
aff4078b5c
am 79bd55cc: am 4bd6ccd2: Merge "Restore save/restore calls removed recently" into honeycomb-mr1
...
* commit '79bd55ccb55e85b39a8d0c867add56021cd608e2':
Restore save/restore calls removed recently
2011-03-07 18:18:21 -08:00
Romain Guy
6945106524
am f018560c: am 25b81110: Merge "Fix EGL JNI bugs Bug #3461349 " into honeycomb-mr1
...
* commit 'f018560cb57e47c3e4bc542e4c596c4d3be3d4c4':
Fix EGL JNI bugs Bug #3461349
2011-03-07 18:16:05 -08:00
Chet Haase
bcca40b327
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
14ed074dfe
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
Adam Powell
9a2f8c1054
am 6ac23abf: am ad542efb: Merge "Fix bug 3506292 - Add guards against bad event streams to ScaleGestureDetector" into honeycomb-mr1
...
* commit '6ac23abf0e3978e6995981810ddc01812a235387':
Fix bug 3506292 - Add guards against bad event streams to ScaleGestureDetector
2011-03-07 18:12:35 -08:00
Chet Haase
d635f04669
Merge "Restore save/restore calls removed recently" into honeycomb-mr1
2011-03-07 18:12:34 -08:00
Romain Guy
5d4d8bed34
Merge "Fix EGL JNI bugs Bug #3461349 " into honeycomb-mr1
2011-03-07 18:11:21 -08:00
Adam Powell
5e3f918be7
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
9fb2277f39
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