Brad Fitzpatrick
8698c91204
am b8332786: am d973bed3: Merge "Removing dead store; it was likely a relict of debuging code."
...
* commit 'b8332786e3ac6d58504a7c3128e94e63255b3515':
Removing dead store; it was likely a relict of debuging code.
2011-03-17 10:36:47 -07:00
Paul Milovanov
074903a95b
am eca7ff02: am 87f50f19: Merge "PACKAGE_FIRST_LAUNCH intent sent to wrong pkg" into honeycomb-mr1
...
* commit 'eca7ff02fb6e75d4355565f05abf8f3af51731a0':
PACKAGE_FIRST_LAUNCH intent sent to wrong pkg
2011-03-17 10:29:50 -07:00
Paul Milovanov
eca7ff02fb
am 87f50f19: Merge "PACKAGE_FIRST_LAUNCH intent sent to wrong pkg" into honeycomb-mr1
...
* commit '87f50f19eef2e70fcf7294c3b9cd5ca0344b99ee':
PACKAGE_FIRST_LAUNCH intent sent to wrong pkg
2011-03-17 10:26:32 -07:00
Paul Milovanov
87f50f19ee
Merge "PACKAGE_FIRST_LAUNCH intent sent to wrong pkg" into honeycomb-mr1
2011-03-17 10:23:48 -07:00
Brad Fitzpatrick
b8332786e3
am d973bed3: Merge "Removing dead store; it was likely a relict of debuging code."
...
* commit 'd973bed36cb4d4da1d97f309119f4114f60e7171':
Removing dead store; it was likely a relict of debuging code.
2011-03-17 10:18:15 -07:00
Brad Fitzpatrick
d973bed36c
Merge "Removing dead store; it was likely a relict of debuging code."
2011-03-17 09:51:47 -07:00
Mike Lockwood
132b23f849
am c97022e7: am 11473332: Merge "MtpServer: Do not attempt to stop MTP if it has not been started" into honeycomb-mr1
...
* commit 'c97022e7acc6da71e558e9137036622b4c77ca46':
MtpServer: Do not attempt to stop MTP if it has not been started
2011-03-17 07:28:26 -07:00
Mike Lockwood
c97022e7ac
am 11473332: Merge "MtpServer: Do not attempt to stop MTP if it has not been started" into honeycomb-mr1
...
* commit '11473332b4df78610ebb903e255d69ab35e5bf59':
MtpServer: Do not attempt to stop MTP if it has not been started
2011-03-17 07:26:44 -07:00
Mike Lockwood
11473332b4
Merge "MtpServer: Do not attempt to stop MTP if it has not been started" into honeycomb-mr1
2011-03-17 07:24:12 -07:00
Mike Lockwood
a3f8514492
MtpServer: Do not attempt to stop MTP if it has not been started
...
Fixes an ANR that occurred if we got a USB disconnected event
before the MTP service had started.
Bug: 4118033
Change-Id: I6cad4281a5911a9926cae923f34d3a6bf98346c5
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-17 09:43:50 -04:00
Daniel Sandler
1b4890c968
am 45026366: am 8f5cab8b: Merge "Remove logspew." into honeycomb-mr1
...
* commit '4502636629ebb3f2ebb8521241c364666d1d7345':
Remove logspew.
2011-03-17 06:35:54 -07:00
Daniel Sandler
4502636629
am 8f5cab8b: Merge "Remove logspew." into honeycomb-mr1
...
* commit '8f5cab8b31014a261f4e6e12e6d751de51de37c3':
Remove logspew.
2011-03-17 06:31:56 -07:00
Daniel Sandler
8f5cab8b31
Merge "Remove logspew." into honeycomb-mr1
2011-03-17 06:23:45 -07:00
Adam Powell
9cd93f09d4
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
ea775ca3ac
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
f8d1533b07
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
Adam Powell
d0197f3669
Fix bug 4111271 and bug 4077526 - WebView touch event handling when
...
WebCore is too slow
Make sure that we can recover properly from a bad gesture with missing
events that never come back from webcore. Lower timeout to 1 second.
Confirm movement on touch event enqueue so that we don't get phantom
taps or long presses when webcore is slow to respond.
Add sanity check in ScaleGestureDetector to end a gesture early on a
bad MotionEvent stream rather than throwing up.
Change-Id: I69690409d7edd6b4320dbcf3b052aba4023360fe
2011-03-17 01:32:17 -07:00
Jozef BABJAK
f1aa297b17
Removing dead store; it was likely a relict of debuging code.
...
Change-Id: I4daab1359d7c4b300ef61e3de1578d9fecb6f8da
2011-03-17 09:23:32 +01:00
Jeff Brown
e5feed7e5d
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
244eb34a67
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
d98f8aff73
Merge "Fix dangling pointer when device closed just after opening." into honeycomb-mr1
2011-03-17 00:59:08 -07:00
Jeff Brown
8e9d4431d6
Fix dangling pointer when device closed just after opening.
...
Bug: 4088239
Change-Id: I210b918370357560a5ace8ea8dd7601255487e88
2011-03-17 00:36:35 -07:00
Mathias Agopian
e22aa62362
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
25594e1984
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
f40e638ec6
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
Paul Milovanov
a57db345d3
PACKAGE_FIRST_LAUNCH intent sent to wrong pkg
...
In PackageManagerService, intent with ACTION_PACKAGE_FIRST_LAUNCH was
being sent to wrong package. It was being sent to the installed
package with installer package in the URI, whereas it should be sent
to installer package with installed package in the URI.
Comment in Intent.java:1417 seems to support that intent with this
action should be sent to the installer package, not installed.
Bug: 3426299
Change-Id: Iadec4ae7a1af6bab434716f8fcdb7d0b099d1ee1
2011-03-16 23:12:31 -07:00
Teng-Hui Zhu
a13640b9ef
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
7a0949c60d
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
7af7e00b91
Merge "Support html5 video switching b/t full screen and inline mode" into honeycomb-mr1
2011-03-16 23:01:03 -07:00
Teng-Hui Zhu
10ab654943
Support html5 video switching b/t full screen and inline mode
...
bug:2126902
Change-Id: I5c4b25358c76e35f0f51794d6d04fcc5098a0d70
2011-03-16 22:06:28 -07:00
Bart Sears
2983bb6a36
am 247820c0: am 8e42d39f: Merge "partial inval" into honeycomb-mr1
...
* commit '247820c0a756413986643a0ed9a8d446afc747ee':
partial inval
2011-03-16 21:52:23 -07:00
Bart Sears
247820c0a7
am 8e42d39f: Merge "partial inval" into honeycomb-mr1
...
* commit '8e42d39f0b1c2a60ab9c2f88cd3835ef8ae690ed':
partial inval
2011-03-16 21:50:52 -07:00
Bart Sears
8e42d39f0b
Merge "partial inval" into honeycomb-mr1
2011-03-16 21:49:09 -07:00
Alex Sakhartchouk
6ff211e08a
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
8f6c5226c5
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
55a9be3d28
Merge "Fix for bug 3434228" into honeycomb-mr1
2011-03-16 21:16:31 -07:00
Alex Sakhartchouk
2c74ad9aae
Fix for bug 3434228
...
Change-Id: I57973faf782b487e7913a096f0ab6012dc1c9415
2011-03-16 19:28:25 -07:00
Adam Cohen
6decf37c98
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
afcb65c2fd
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
296c1616ba
Merge "Catching all Exceptions when calling through to RemoteViewsFactory" into honeycomb-mr1
2011-03-16 18:02:08 -07:00
Romain Guy
72064c66e2
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
Romain Guy
b0204d0a27
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
c2b91a6113
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
8504423f00
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
c657fcce45
am 20ccaf6c: Import revised translations. DO NOT MERGE
...
* commit '20ccaf6cc1a79a3f7973e5875c66e2bce2ebee7c':
Import revised translations. DO NOT MERGE
2011-03-16 17:10:09 -07:00
Eric Fischer
20ccaf6cc1
Import revised translations. DO NOT MERGE
...
Change-Id: I59b21268d693f0fac87e787fceb4f41b3f3e6acd
2011-03-16 16:48:09 -07:00
Yu Shan Emily Lau
0af00ebc17
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
797f5b0c00
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
fd5c1f7c57
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
Yu Shan Emily Lau
9dab784705
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:36:17 -07:00