Daniel Sandler
9abaf18427
am 8f5cab8b: Merge "Remove logspew." into honeycomb-mr1
...
* commit '8f5cab8b31014a261f4e6e12e6d751de51de37c3':
Remove logspew.
2011-03-17 06:31:56 -07:00
Daniel Sandler
7d96e2657e
Merge "Remove logspew." into honeycomb-mr1
2011-03-17 06:23:45 -07:00
Adam Powell
8024aabc8a
am 9cd93f09: am ea775ca3: am f8d1533b: Merge "Fix bug 4111271 and bug 4077526 - WebView touch event handling when WebCore is too slow" into honeycomb-mr1
...
* commit '9cd93f09d451afacb8fffeee5e71806e0f91cf31':
Fix bug 4111271 and bug 4077526 - WebView touch event handling when WebCore is too slow
2011-03-17 01:41:30 -07:00
Adam Powell
8af3fb35d5
am ea775ca3: am f8d1533b: Merge "Fix bug 4111271 and bug 4077526 - WebView touch event handling when WebCore is too slow" into honeycomb-mr1
...
* commit 'ea775ca3ac793033e91b4d1cc05dfdb53ab807be':
Fix bug 4111271 and bug 4077526 - WebView touch event handling when WebCore is too slow
2011-03-17 01:39:44 -07:00
Adam Powell
84391e64c8
am f8d1533b: Merge "Fix bug 4111271 and bug 4077526 - WebView touch event handling when WebCore is too slow" into honeycomb-mr1
...
* commit 'f8d1533b07b51935e295b2cf92e2ea2aa94b303f':
Fix bug 4111271 and bug 4077526 - WebView touch event handling when WebCore is too slow
2011-03-17 01:38:15 -07:00
Adam Powell
c985885653
Merge "Fix bug 4111271 and bug 4077526 - WebView touch event handling when WebCore is too slow" into honeycomb-mr1
2011-03-17 01:36:47 -07:00
Jeff Brown
2f01f694e0
am e5feed7e: am 244eb34a: am d98f8aff: Merge "Fix dangling pointer when device closed just after opening." into honeycomb-mr1
...
* commit 'e5feed7e5ded92b8af4b5548144b6b8a45491a61':
Fix dangling pointer when device closed just after opening.
2011-03-17 01:03:56 -07:00
Jeff Brown
a67bdc7c2c
am 244eb34a: am d98f8aff: Merge "Fix dangling pointer when device closed just after opening." into honeycomb-mr1
...
* commit '244eb34a6712688fa87653dd3e2e2d05cd568eec':
Fix dangling pointer when device closed just after opening.
2011-03-17 01:02:28 -07:00
Jeff Brown
cd00ac8d55
am d98f8aff: Merge "Fix dangling pointer when device closed just after opening." into honeycomb-mr1
...
* commit 'd98f8aff731123eef1f0a8bc8bfc917647d5ac3a':
Fix dangling pointer when device closed just after opening.
2011-03-17 01:00:36 -07:00
Jeff Brown
8fb4327df3
Merge "Fix dangling pointer when device closed just after opening." into honeycomb-mr1
2011-03-17 00:59:08 -07:00
Mathias Agopian
939fee8819
am e22aa623: am 25594e19: am f40e638e: fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondition(LockCondition) timed out
...
* commit 'e22aa62362a3007ee59ac62d4b5969e216987995':
fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondition(LockCondition) timed out
2011-03-17 00:13:49 -07:00
Mathias Agopian
679c2bc790
am 25594e19: am f40e638e: fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondition(LockCondition) timed out
...
* commit '25594e1984125081878d2ea057700366a34a8ccf':
fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondition(LockCondition) timed out
2011-03-17 00:12:01 -07:00
Mathias Agopian
9260be0e79
am f40e638e: fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondition(LockCondition) timed out
...
* commit 'f40e638ec62cd9e1a1851809b7c8bf5e4187fad2':
fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondition(LockCondition) timed out
2011-03-17 00:10:10 -07:00
Mathias Agopian
d0b55c011a
fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondition(LockCondition) timed out
...
a memory corruption happned when the buffer pool was resized
(like when playing a video or using camera) and there was
no current active buffer. In this case, the faulty code
would index into an array at position -1 which corrupted
24 bytes of data.
also improved region validation code (ifdef'ed out by default)
Bug: 4093196
Change-Id: I915c581d131148959d720e00e3892e9186ab733d
2011-03-17 00:04:42 -07:00
Teng-Hui Zhu
b290278a67
am a13640b9: am 7a0949c6: am 7af7e00b: Merge "Support html5 video switching b/t full screen and inline mode" into honeycomb-mr1
...
* commit 'a13640b9efe1706ad0b6b608ccfca800166d7c01':
Support html5 video switching b/t full screen and inline mode
2011-03-16 23:08:20 -07:00
Teng-Hui Zhu
fc3d156784
am 7a0949c6: am 7af7e00b: Merge "Support html5 video switching b/t full screen and inline mode" into honeycomb-mr1
...
* commit '7a0949c60df2085fc38eea71d78f9c17eb26cd65':
Support html5 video switching b/t full screen and inline mode
2011-03-16 23:05:41 -07:00
Teng-Hui Zhu
4fd8d4cbce
am 7af7e00b: Merge "Support html5 video switching b/t full screen and inline mode" into honeycomb-mr1
...
* commit '7af7e00b9112f15d1683ae93975a6fcd9dd34da8':
Support html5 video switching b/t full screen and inline mode
2011-03-16 23:03:04 -07:00
Teng-Hui Zhu
d5b7248aed
Merge "Support html5 video switching b/t full screen and inline mode" into honeycomb-mr1
2011-03-16 23:01:03 -07:00
Bart Sears
661e08b89d
am 2983bb6a: am 247820c0: am 8e42d39f: Merge "partial inval" into honeycomb-mr1
...
* commit '2983bb6a363010403668d39fdc42f5712bff5eb3':
partial inval
2011-03-16 21:54:38 -07:00
Bart Sears
f3850c0015
am 247820c0: am 8e42d39f: Merge "partial inval" into honeycomb-mr1
...
* commit '247820c0a756413986643a0ed9a8d446afc747ee':
partial inval
2011-03-16 21:52:23 -07:00
Bart Sears
0c457ee474
am 8e42d39f: Merge "partial inval" into honeycomb-mr1
...
* commit '8e42d39f0b1c2a60ab9c2f88cd3835ef8ae690ed':
partial inval
2011-03-16 21:50:52 -07:00
Bart Sears
b5ff32a575
Merge "partial inval" into honeycomb-mr1
2011-03-16 21:49:09 -07:00
Alex Sakhartchouk
193fc9bcc1
am 6ff211e0: am 8f6c5226: am 55a9be3d: Merge "Fix for bug 3434228" into honeycomb-mr1
...
* commit '6ff211e08a7c5d51e3899d10be53878c05c244b5':
Fix for bug 3434228
2011-03-16 21:22:10 -07:00
Alex Sakhartchouk
eda60570fd
am 8f6c5226: am 55a9be3d: Merge "Fix for bug 3434228" into honeycomb-mr1
...
* commit '8f6c5226c5a0522cf2bbad987004e362098d9464':
Fix for bug 3434228
2011-03-16 21:20:37 -07:00
Alex Sakhartchouk
1165479006
am 55a9be3d: Merge "Fix for bug 3434228" into honeycomb-mr1
...
* commit '55a9be3d284d17045d9d3546c57d9dc3c4c8a521':
Fix for bug 3434228
2011-03-16 21:18:37 -07:00
Alex Sakhartchouk
a320dedae7
Merge "Fix for bug 3434228" into honeycomb-mr1
2011-03-16 21:16:31 -07:00
Simon Wilson
2d0c7bfc6a
Merge "DO NOT MERGE Add images to ERI icon list" into gingerbread
2011-03-16 19:51:07 -07:00
Adam Cohen
ef24f9ab64
am 6decf37c: am afcb65c2: am 296c1616: Merge "Catching all Exceptions when calling through to RemoteViewsFactory" into honeycomb-mr1
...
* commit '6decf37c98380271013c057862efcef137bc4f6c':
Catching all Exceptions when calling through to RemoteViewsFactory
2011-03-16 18:06:43 -07:00
Adam Cohen
9a4ac8c599
am afcb65c2: am 296c1616: Merge "Catching all Exceptions when calling through to RemoteViewsFactory" into honeycomb-mr1
...
* commit 'afcb65c2fdc6892a605fced93da13f6ff455bd2b':
Catching all Exceptions when calling through to RemoteViewsFactory
2011-03-16 18:04:49 -07:00
Adam Cohen
cfe73d165a
am 296c1616: Merge "Catching all Exceptions when calling through to RemoteViewsFactory" into honeycomb-mr1
...
* commit '296c1616bad5a075cf64c2ba025b0cfd6bb3816d':
Catching all Exceptions when calling through to RemoteViewsFactory
2011-03-16 18:03:23 -07:00
Adam Cohen
e330f4b40e
Merge "Catching all Exceptions when calling through to RemoteViewsFactory" into honeycomb-mr1
2011-03-16 18:02:08 -07:00
Romain Guy
043e3d42f1
am 72064c66: am b0204d0a: am c2b91a61: Merge "Modify the GL renderer\'s functor to pass the clip to WebView" into honeycomb-mr1
...
* commit '72064c66e20b9cc86900a9d833c228c345a2b2a4':
Modify the GL renderer's functor to pass the clip to WebView
2011-03-16 17:31:30 -07:00
Romain Guy
e5ebb726f2
am b0204d0a: am c2b91a61: Merge "Modify the GL renderer\'s functor to pass the clip to WebView" into honeycomb-mr1
...
* commit 'b0204d0a271dafdf5be216f30c001929bdd831c0':
Modify the GL renderer's functor to pass the clip to WebView
2011-03-16 17:28:43 -07:00
Stephen Hines
e7c86bf2ed
Merge "Check setName() for null string + typo fixes."
2011-03-16 17:27:48 -07:00
Romain Guy
8311f4202c
am c2b91a61: Merge "Modify the GL renderer\'s functor to pass the clip to WebView" into honeycomb-mr1
...
* commit 'c2b91a6113c30d3b994ef081fbd5b941200d55a4':
Modify the GL renderer's functor to pass the clip to WebView
2011-03-16 17:26:41 -07:00
Romain Guy
a0f38d2785
Merge "Modify the GL renderer's functor to pass the clip to WebView" into honeycomb-mr1
2011-03-16 17:24:32 -07:00
Eric Fischer
18c49e7be8
am 8504423f: (-s ours) am c657fcce: am 20ccaf6c: Import revised translations. DO NOT MERGE
...
* commit '8504423f00237e13e87499f74e41ecf73c3e8e1b':
Import revised translations. DO NOT MERGE
2011-03-16 17:14:07 -07:00
Eric Fischer
1dd4a81c6f
am c657fcce: am 20ccaf6c: Import revised translations. DO NOT MERGE
...
* commit 'c657fcce45fa4d9817589e96508f5ddf0ae09c61':
Import revised translations. DO NOT MERGE
2011-03-16 17:11:54 -07:00
Eric Fischer
3ed2e9b1e5
am 20ccaf6c: Import revised translations. DO NOT MERGE
...
* commit '20ccaf6cc1a79a3f7973e5875c66e2bce2ebee7c':
Import revised translations. DO NOT MERGE
2011-03-16 17:10:09 -07:00
Yu Shan Emily Lau
0a0f15bfb3
am 0af00ebc: am 797f5b0c: am fd5c1f7c: Merge "Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6" into ho
...
* commit '0af00ebc178a90d53a2aba92b8f8c11cfca8c1f4':
Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6
2011-03-16 16:47:08 -07:00
Yu Shan Emily Lau
3f4f0214c1
am 797f5b0c: am fd5c1f7c: Merge "Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6" into honeycomb-mr1
...
* commit '797f5b0c00895c21ff755ec7f6974e1d2e763b13':
Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6
2011-03-16 16:45:37 -07:00
Yu Shan Emily Lau
cf033b3f26
am fd5c1f7c: Merge "Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6" into honeycomb-mr1
...
* commit 'fd5c1f7c575451cf3566d1a8290b0b001bddfa39':
Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6
2011-03-16 16:43:04 -07:00
Yu Shan Emily Lau
b5c21a3a3b
Merge "Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6" into honeycomb-mr1
2011-03-16 16:40:46 -07:00
Rajneesh Chowdury
49714fcdf9
am ce254e86: am 69d05490: am 0edefea8: Merge "Fix for 4087846 Crash reported by monkey report (Java/Jni)" into honeycomb-mr1
...
* commit 'ce254e8613ddc4d57a8a5a8a2763b22690f451a4':
Fix for 4087846 Crash reported by monkey report (Java/Jni)
2011-03-16 16:10:32 -07:00
Rajneesh Chowdury
a8d32f7b24
am 69d05490: am 0edefea8: Merge "Fix for 4087846 Crash reported by monkey report (Java/Jni)" into honeycomb-mr1
...
* commit '69d05490345e96e1155e3b33eb5e36761b07a314':
Fix for 4087846 Crash reported by monkey report (Java/Jni)
2011-03-16 16:08:09 -07:00
Rajneesh Chowdury
8e384bd92d
am 0edefea8: Merge "Fix for 4087846 Crash reported by monkey report (Java/Jni)" into honeycomb-mr1
...
* commit '0edefea88e975613bca9f0227614de91434ade11':
Fix for 4087846 Crash reported by monkey report (Java/Jni)
2011-03-16 16:05:54 -07:00
Mathias Agopian
7d7723d330
am 9405d987: am a05a8ac5: am af831a7b: Merge "fix [4107131] nvidia driver call takes a very long time" into honeycomb-mr1
...
* commit '9405d98705db1c8102b77ef960f344ac416d165c':
fix [4107131] nvidia driver call takes a very long time
2011-03-16 16:03:24 -07:00
Andreas Huber
5c2610eb49
Merge "Don't send the seek-complete notification twice."
2011-03-16 16:03:19 -07:00
Rajneesh Chowdury
aeb686df2e
Merge "Fix for 4087846 Crash reported by monkey report (Java/Jni)" into honeycomb-mr1
2011-03-16 16:03:15 -07:00
Mathias Agopian
c33924df42
am a05a8ac5: am af831a7b: Merge "fix [4107131] nvidia driver call takes a very long time" into honeycomb-mr1
...
* commit 'a05a8ac5eef083a4c28c1fb4eceea92100cf86a2':
fix [4107131] nvidia driver call takes a very long time
2011-03-16 16:01:31 -07:00