Eric Fischer
3e8b4373f1
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-22 13:56:47 -07:00
Teng-Hui Zhu
ae01e99c1a
Merge "fix for pause when loading" into honeycomb-mr1
2011-03-22 13:55:28 -07:00
Dianne Hackborn
38475e7294
Merge "Now have a final API 12." into honeycomb-mr1
2011-03-22 12:58:00 -07:00
shailendra
6e7b75f517
Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)" into honeycomb-mr1
2011-03-22 11:48:12 -07:00
Gloria Wang
cbd0c8a74f
Merge "Add one more field in DecryptHandle to support bug 4126624" into honeycomb-mr1
2011-03-22 11:04:32 -07:00
Andreas Huber
2a15f0fb93
Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1
2011-03-22 08:37:58 -07:00
Teng-Hui Zhu
0cccea1543
Merge "Fix a crash" into honeycomb-mr1
2011-03-21 18:09:57 -07:00
Yu Shan Emily Lau
10399b194f
Merge "Add the mem logging into test utility. Bug# 4108259" into honeycomb-mr1
2011-03-21 17:32:17 -07:00
Gloria Wang
838c9844f7
Merge "do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624." into honeycomb-mr1
2011-03-21 17:26:03 -07:00
Justin Ho
6967dd8e24
Merge "Fixing list selector theme Bug: 4147203" into honeycomb-mr1
2011-03-21 16:52:35 -07:00
Teng-Hui Zhu
0953e89934
Merge "Support loading image and paused image for inline video" into honeycomb-mr1
2011-03-21 14:01:10 -07:00
Mike Lockwood
731d1353d3
Merge "UsbService: Handle the case where a USB accessory connects as the device is booting" into honeycomb-mr1
2011-03-20 17:08:24 -07:00
Jamie Gennis
d32a694a0c
Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1
2011-03-18 17:32:25 -07:00
Jamie Gennis
5fd799dab6
SurfaceFlinger: Fix a typo.
...
This change makes Layer skip its cleanup of its old shared memory region
when the UserClient object that owned the memory has been freed.
Bug: 3429357
Change-Id: I9e4d8eb190f6914dc043674b9bb8dd28e959901b
2011-03-18 16:35:13 -07:00
Russell Brenner
b36926abde
Merge "DO NOT MERGE Send WebView the current transform and whether we're drawing a layer. Bug #3275491 " into honeycomb-mr1
2011-03-18 15:28:27 -07:00
Teng-Hui Zhu
c53cb0d36c
Merge "Asset for video poster" into honeycomb-mr1
2011-03-18 15:19:28 -07:00
Daisuke Miyakawa
48a27defe9
am e16a1bfa: Use system locale list.
...
* commit 'e16a1bfa9cd9a9a0430e2fe890586ae451f0faaf':
Use system locale list.
2011-03-18 11:23:00 -07:00
Derek Sollenberger
800094d7d1
Merge "Prevent intermediate scale updates from being sent to WebKit while zooming." into honeycomb-mr1
2011-03-18 10:57:46 -07:00
shailendra
886c92028f
Merge "Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)" into honeycomb-mr1
2011-03-18 09:35:37 -07:00
Dianne Hackborn
acf8cb2596
Merge "Whoops, forgot the HONEYCOMB_MR1 constant. :(" into honeycomb-mr1
2011-03-17 19:00:56 -07:00
Huahui Wu
f6fb4ed1dc
Merge "b/4116658 Fix the jumpy scrolling with some flash site." into honeycomb-mr1
2011-03-17 18:09:33 -07:00
Wink Saville
b77b4807d0
Merge "Change stopship to todo." into honeycomb-mr1
2011-03-17 17:58:06 -07:00
Justin Ho
c14e692d62
Merge "Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF" into honeycomb-mr1
2011-03-17 16:49:32 -07:00
James Dong
29c6574d45
Merge "Fix missing AOSP copyright headers for more files" into honeycomb-mr1
2011-03-17 16:11:13 -07:00
James Dong
5f7204cb66
Fix missing AOSP copyright headers for more files
...
o Update the copyright date on InputDispatcher_test.cpp and InputReader_test.cpp
because these two files were moved from other places to the current location,
and were actually created in 2010.
bug - 4119349
Change-Id: Ic93b81ddafb58e9e72a2e9e02ca3d9f173d6dca7
2011-03-17 14:43:12 -07:00
Teng-Hui Zhu
691935bfcd
Merge "Fix the aspect ratio for full screen playing" into honeycomb-mr1
2011-03-17 14:20:39 -07:00
Xavier Ducrohet
fdebf54854
Merge "LayoutLib: TypedArray.getDimensionPixelSize can actually return <0" into honeycomb-mr1
2011-03-17 14:12:49 -07:00
Eric Fischer
d4c0f4ec71
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-17 13:29:47 -07:00
Gloria Wang
3e99aa92cb
Merge "Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls" into honeycomb-mr1
2011-03-17 10:49:43 -07:00
Paul Milovanov
c7112b9ef8
Merge "PACKAGE_FIRST_LAUNCH intent sent to wrong pkg" into honeycomb-mr1
2011-03-17 10:23:48 -07:00
Mike Lockwood
973c0ad411
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
Daniel Sandler
7d96e2657e
Merge "Remove logspew." into honeycomb-mr1
2011-03-17 06:23:45 -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
8fb4327df3
Merge "Fix dangling pointer when device closed just after opening." into honeycomb-mr1
2011-03-17 00:59:08 -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
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
b5ff32a575
Merge "partial inval" into honeycomb-mr1
2011-03-16 21:49:09 -07:00
Alex Sakhartchouk
a320dedae7
Merge "Fix for bug 3434228" into honeycomb-mr1
2011-03-16 21:16:31 -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
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
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
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
da155b248b
Merge "fix [4107131] nvidia driver call takes a very long time" into honeycomb-mr1
2011-03-16 15:57:57 -07:00
Romain Guy
a08152f43c
Modify the GL renderer's functor to pass the clip to WebView
...
Change-Id: If5efe399ca58f3000b2883e24e9f3736a2025184
2011-03-16 15:31:33 -07:00
James Dong
fa064b9933
Merge "Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file." into honeycomb-mr1
2011-03-16 15:09:21 -07:00
Mathias Agopian
36bdf14a75
fix [4107131] nvidia driver call takes a very long time
...
We were leaking all EGLSyncKHR objects, over time the list
would grow and become very slow to operate on.
Bug: 4107131
Change-Id: I6c82daf49fe3189d04550781d64d57c30c95f552
2011-03-16 14:19:03 -07:00
Michael Kolb
d52a4c4ac0
Merge "add comment to deprecated tag" into honeycomb-mr1
2011-03-16 13:10:48 -07:00
Andreas Huber
ecdbccea55
Merge "DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting." into honeycomb-mr1
2011-03-16 13:06:52 -07:00
Mike Lockwood
b80cf4bdf6
Merge "USB System UI: Improve message for the "no app for USB accessory" dialog." into honeycomb-mr1
2011-03-16 12:03:39 -07:00
Michael Kolb
5d05f431dd
Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1
2011-03-16 11:33:13 -07:00
