OSDN Git Service
Dianne Hackborn [Tue, 22 Mar 2011 20:01:19 +0000 (13:01 -0700)]
am
8dcd6647: Merge "Now have a final API 12." into honeycomb-mr1
* commit '
8dcd66476069c9241c2acbbafc1a85e42bd7a303':
Now have a final API 12.
Dianne Hackborn [Tue, 22 Mar 2011 19:58:00 +0000 (12:58 -0700)]
Merge "Now have a final API 12." into honeycomb-mr1
shailendra [Tue, 22 Mar 2011 18:50:15 +0000 (11:50 -0700)]
am
8483073e: Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(
4128259)" into honeycomb-mr1
* commit '
8483073ec21b5e2332deaad914eba1d087b1d1e3':
Fix for testPropertiesWMVFile case failed with build HMI75B(
4128259)
shailendra [Tue, 22 Mar 2011 18:48:12 +0000 (11:48 -0700)]
Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(
4128259)" into honeycomb-mr1
Gloria Wang [Tue, 22 Mar 2011 18:06:43 +0000 (11:06 -0700)]
am
3cc797b9: Merge "Add one more field in DecryptHandle to support bug
4126624" into honeycomb-mr1
* commit '
3cc797b9c416e01ad6bfab5f2bfb2c6cbf9e44ed':
Add one more field in DecryptHandle to support bug
4126624
Gloria Wang [Tue, 22 Mar 2011 18:04:32 +0000 (11:04 -0700)]
Merge "Add one more field in DecryptHandle to support bug
4126624" into honeycomb-mr1
Andreas Huber [Tue, 22 Mar 2011 15:48:58 +0000 (08:48 -0700)]
am
453c0d5f: Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1
* commit '
453c0d5f16a09473b0653566973bf8b6a867cf79':
DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue.
Andreas Huber [Tue, 22 Mar 2011 15:37:58 +0000 (08:37 -0700)]
Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1
Teng-Hui Zhu [Tue, 22 Mar 2011 01:13:21 +0000 (18:13 -0700)]
am
039aa81a: Merge "Fix a crash" into honeycomb-mr1
* commit '
039aa81a67465f189c24f92567ccb08ed8a5dce2':
Fix a crash
Teng-Hui Zhu [Tue, 22 Mar 2011 01:09:57 +0000 (18:09 -0700)]
Merge "Fix a crash" into honeycomb-mr1
Yu Shan Emily Lau [Tue, 22 Mar 2011 01:00:32 +0000 (18:00 -0700)]
am
02109972: Merge "Add the mem logging into test utility. Bug#
4108259" into honeycomb-mr1
* commit '
0210997218fc22b77c71a43a2396419cd0a39166':
Add the mem logging into test utility. Bug#
4108259
Gloria Wang [Tue, 22 Mar 2011 01:00:30 +0000 (18:00 -0700)]
am
7abedd0c: Merge "do not merge: Cherry pick change I6529695c from master to partially fix bug
4126624." into honeycomb-mr1
* commit '
7abedd0cdefdcd6d3b62808724e721bb1b92b185':
do not merge: Cherry pick change I6529695c from master to partially fix bug
4126624.
Justin Ho [Tue, 22 Mar 2011 00:59:59 +0000 (17:59 -0700)]
am
9db9a7d3: Merge "Fixing list selector theme Bug:
4147203" into honeycomb-mr1
* commit '
9db9a7d3f4428552b3ce553df5184bcbbe8db8dd':
Fixing list selector theme Bug:
4147203
Yu Shan Emily Lau [Tue, 22 Mar 2011 00:32:17 +0000 (17:32 -0700)]
Merge "Add the mem logging into test utility. Bug#
4108259" into honeycomb-mr1
Gloria Wang [Tue, 22 Mar 2011 00:26:03 +0000 (17:26 -0700)]
Merge "do not merge: Cherry pick change I6529695c from master to partially fix bug
4126624." into honeycomb-mr1
Justin Ho [Mon, 21 Mar 2011 23:52:35 +0000 (16:52 -0700)]
Merge "Fixing list selector theme Bug:
4147203" into honeycomb-mr1
Andreas Huber [Mon, 21 Mar 2011 23:21:29 +0000 (16:21 -0700)]
am
e2c32e9f: If nothing is to be copied, return right away.
* commit '
e2c32e9f966cf9f2c9ed94bf0703344a2cca284b':
If nothing is to be copied, return right away.
Teng-Hui Zhu [Mon, 21 Mar 2011 21:19:29 +0000 (14:19 -0700)]
am
0b933c02: Merge "Support loading image and paused image for inline video" into honeycomb-mr1
* commit '
0b933c02dddbc325498b3b73d8be9167b155801b':
Support loading image and paused image for inline video
Teng-Hui Zhu [Mon, 21 Mar 2011 21:01:10 +0000 (14:01 -0700)]
Merge "Support loading image and paused image for inline video" into honeycomb-mr1
Justin Ho [Mon, 21 Mar 2011 17:54:51 +0000 (10:54 -0700)]
am
5e35c485: Updated 3G and wifi traffic indicators
* commit '
5e35c4855a972960403a10811882ebded8945006':
Updated 3G and wifi traffic indicators
Mike Lockwood [Mon, 21 Mar 2011 00:25:09 +0000 (17:25 -0700)]
am
dd76dc02: Merge "UsbService: Handle the case where a USB accessory connects as the device is booting" into honeycomb-mr1
* commit '
dd76dc0297f4c39fefbbc1ac23d9b1add187d9e9':
UsbService: Handle the case where a USB accessory connects as the device is booting
Mike Lockwood [Mon, 21 Mar 2011 00:08:24 +0000 (17:08 -0700)]
Merge "UsbService: Handle the case where a USB accessory connects as the device is booting" into honeycomb-mr1
Jamie Gennis [Sat, 19 Mar 2011 00:34:27 +0000 (17:34 -0700)]
am
38caff23: Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1
* commit '
38caff230d1ee52701cc8cffde0309b91c2016d6':
SurfaceFlinger: Fix a typo.
Jamie Gennis [Sat, 19 Mar 2011 00:32:25 +0000 (17:32 -0700)]
Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1
Jamie Gennis [Fri, 18 Mar 2011 23:35:13 +0000 (16:35 -0700)]
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
Russell Brenner [Fri, 18 Mar 2011 22:32:18 +0000 (15:32 -0700)]
am
a0dc8da2: Merge "DO NOT MERGE Send WebView the current transform and whether we\'re drawing a layer. Bug #
3275491" into honeycomb-mr1
* commit '
a0dc8da2ab0a084432c7094e434b7957dd2eaf5c':
DO NOT MERGE Send WebView the current transform and whether we're drawing a layer. Bug #
3275491
Russell Brenner [Fri, 18 Mar 2011 22:28:27 +0000 (15:28 -0700)]
Merge "DO NOT MERGE Send WebView the current transform and whether we're drawing a layer. Bug #
3275491" into honeycomb-mr1
Teng-Hui Zhu [Fri, 18 Mar 2011 22:22:03 +0000 (15:22 -0700)]
am
7eaf4831: Merge "Asset for video poster" into honeycomb-mr1
* commit '
7eaf483140f1c42f29c7cde71061521280b253ce':
Asset for video poster
Teng-Hui Zhu [Fri, 18 Mar 2011 22:19:28 +0000 (15:19 -0700)]
Merge "Asset for video poster" into honeycomb-mr1
Daisuke Miyakawa [Fri, 18 Mar 2011 18:27:22 +0000 (11:27 -0700)]
am
b02d3956: am
e16a1bfa: Use system locale list.
* commit '
b02d395650a9a5fb13812cefa0ada1501f5b6d62':
Use system locale list.
Daisuke Miyakawa [Fri, 18 Mar 2011 18:23:00 +0000 (11:23 -0700)]
am
e16a1bfa: Use system locale list.
* commit '
e16a1bfa9cd9a9a0430e2fe890586ae451f0faaf':
Use system locale list.
Derek Sollenberger [Fri, 18 Mar 2011 18:02:45 +0000 (11:02 -0700)]
am
5750bb7d: Merge "Prevent intermediate scale updates from being sent to WebKit while zooming." into honeycomb-mr1
* commit '
5750bb7d8f59c0f8e18baaa60bcb492c867db590':
Prevent intermediate scale updates from being sent to WebKit while zooming.
shailendra [Fri, 18 Mar 2011 18:02:35 +0000 (11:02 -0700)]
am
0d922ec9: Merge "Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(
4124235)" into honeycomb-mr1
* commit '
0d922ec92dfe1d4adb6c66cdd2d3c16eb6b29776':
Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(
4124235)
Derek Sollenberger [Fri, 18 Mar 2011 17:57:46 +0000 (10:57 -0700)]
Merge "Prevent intermediate scale updates from being sent to WebKit while zooming." into honeycomb-mr1
shailendra [Fri, 18 Mar 2011 16:35:37 +0000 (09:35 -0700)]
Merge "Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(
4124235)" into honeycomb-mr1
Dianne Hackborn [Fri, 18 Mar 2011 02:02:15 +0000 (19:02 -0700)]
am
1d50ad79: Merge "Whoops, forgot the HONEYCOMB_MR1 constant. :(" into honeycomb-mr1
* commit '
1d50ad7914de36b63a04d39bdc4791c1dadc7eae':
Whoops, forgot the HONEYCOMB_MR1 constant. :(
Dianne Hackborn [Fri, 18 Mar 2011 02:00:56 +0000 (19:00 -0700)]
Merge "Whoops, forgot the HONEYCOMB_MR1 constant. :(" into honeycomb-mr1
Huahui Wu [Fri, 18 Mar 2011 01:11:04 +0000 (18:11 -0700)]
am
b1c43c32: Merge "b/
4116658 Fix the jumpy scrolling with some flash site." into honeycomb-mr1
* commit '
b1c43c32f518240fd75963ffc8e82cb13e036390':
b/
4116658 Fix the jumpy scrolling with some flash site.
Huahui Wu [Fri, 18 Mar 2011 01:09:33 +0000 (18:09 -0700)]
Merge "b/
4116658 Fix the jumpy scrolling with some flash site." into honeycomb-mr1
Wink Saville [Fri, 18 Mar 2011 01:00:55 +0000 (18:00 -0700)]
am
651f38d7: Merge "Change stopship to todo." into honeycomb-mr1
* commit '
651f38d71788d6b1d50cb6c9810ba31f903407d9':
Change stopship to todo.
Wink Saville [Fri, 18 Mar 2011 00:58:06 +0000 (17:58 -0700)]
Merge "Change stopship to todo." into honeycomb-mr1
Justin Ho [Fri, 18 Mar 2011 00:55:58 +0000 (17:55 -0700)]
am
5dbd0978: Merge "Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF" into honeycomb-mr1
* commit '
5dbd0978cd7f2d3ff1e28bbfdef2f757de28e1bc':
Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF
James Dong [Fri, 18 Mar 2011 00:55:48 +0000 (17:55 -0700)]
am
be368de7: Merge "Fix missing AOSP copyright headers for more files" into honeycomb-mr1
* commit '
be368de7b7614e89bae8fb59ea4283eba890a2c1':
Fix missing AOSP copyright headers for more files
Justin Ho [Thu, 17 Mar 2011 23:49:32 +0000 (16:49 -0700)]
Merge "Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF" into honeycomb-mr1
James Dong [Thu, 17 Mar 2011 23:11:13 +0000 (16:11 -0700)]
Merge "Fix missing AOSP copyright headers for more files" into honeycomb-mr1
James Dong [Thu, 17 Mar 2011 18:48:13 +0000 (11:48 -0700)]
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
Teng-Hui Zhu [Thu, 17 Mar 2011 21:22:26 +0000 (14:22 -0700)]
am
73091273: Merge "Fix the aspect ratio for full screen playing" into honeycomb-mr1
* commit '
73091273bb5160567f2230e1e7fcde5b0218ad9d':
Fix the aspect ratio for full screen playing
Teng-Hui Zhu [Thu, 17 Mar 2011 21:20:39 +0000 (14:20 -0700)]
Merge "Fix the aspect ratio for full screen playing" into honeycomb-mr1
Xavier Ducrohet [Thu, 17 Mar 2011 21:15:38 +0000 (14:15 -0700)]
am
026d6be2: Merge "LayoutLib: TypedArray.getDimensionPixelSize can actually return <0" into honeycomb-mr1
* commit '
026d6be2dcc425f83d9d7ec8740068147497b305':
LayoutLib: TypedArray.getDimensionPixelSize can actually return <0
Xavier Ducrohet [Thu, 17 Mar 2011 21:12:49 +0000 (14:12 -0700)]
Merge "LayoutLib: TypedArray.getDimensionPixelSize can actually return <0" into honeycomb-mr1
Eric Fischer [Thu, 17 Mar 2011 20:32:58 +0000 (13:32 -0700)]
am
e6ef8d0b: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '
e6ef8d0b75494e8d1e8f619b2a461c11fe8fb965':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 17 Mar 2011 20:29:47 +0000 (13:29 -0700)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
James Dong [Thu, 17 Mar 2011 18:56:05 +0000 (11:56 -0700)]
am
2f1f2248: Fix missing AOSP copyright headers for a bunch of media framework files
* commit '
2f1f2248c8439adbd686810e306c55f9e6a5abc3':
Fix missing AOSP copyright headers for a bunch of media framework files
Gloria Wang [Thu, 17 Mar 2011 17:54:00 +0000 (10:54 -0700)]
am
def35f7a: 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
* commit '
def35f7a47cde8bf66d4cba4570b289e0e9d625a':
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
Gloria Wang [Thu, 17 Mar 2011 17:49:43 +0000 (10:49 -0700)]
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
Paul Milovanov [Thu, 17 Mar 2011 17:26:32 +0000 (10:26 -0700)]
am
87f50f19: Merge "PACKAGE_FIRST_LAUNCH intent sent to wrong pkg" into honeycomb-mr1
* commit '
87f50f19eef2e70fcf7294c3b9cd5ca0344b99ee':
PACKAGE_FIRST_LAUNCH intent sent to wrong pkg
Paul Milovanov [Thu, 17 Mar 2011 17:23:48 +0000 (10:23 -0700)]
Merge "PACKAGE_FIRST_LAUNCH intent sent to wrong pkg" into honeycomb-mr1
Mike Lockwood [Thu, 17 Mar 2011 14:26:44 +0000 (07:26 -0700)]
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
Mike Lockwood [Thu, 17 Mar 2011 14:24:12 +0000 (07:24 -0700)]
Merge "MtpServer: Do not attempt to stop MTP if it has not been started" into honeycomb-mr1
Daniel Sandler [Thu, 17 Mar 2011 13:31:56 +0000 (06:31 -0700)]
am
8f5cab8b: Merge "Remove logspew." into honeycomb-mr1
* commit '
8f5cab8b31014a261f4e6e12e6d751de51de37c3':
Remove logspew.
Daniel Sandler [Thu, 17 Mar 2011 13:23:45 +0000 (06:23 -0700)]
Merge "Remove logspew." into honeycomb-mr1
Adam Powell [Thu, 17 Mar 2011 08:38:15 +0000 (01:38 -0700)]
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
Adam Powell [Thu, 17 Mar 2011 08:36:47 +0000 (01:36 -0700)]
Merge "Fix bug
4111271 and bug
4077526 - WebView touch event handling when WebCore is too slow" into honeycomb-mr1
Jeff Brown [Thu, 17 Mar 2011 08:00:36 +0000 (01:00 -0700)]
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.
Jeff Brown [Thu, 17 Mar 2011 07:59:08 +0000 (00:59 -0700)]
Merge "Fix dangling pointer when device closed just after opening." into honeycomb-mr1
Mathias Agopian [Thu, 17 Mar 2011 07:10:10 +0000 (00:10 -0700)]
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
Mathias Agopian [Thu, 17 Mar 2011 06:18:07 +0000 (23:18 -0700)]
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
Teng-Hui Zhu [Thu, 17 Mar 2011 06:03:04 +0000 (23:03 -0700)]
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
Teng-Hui Zhu [Thu, 17 Mar 2011 06:01:02 +0000 (23:01 -0700)]
Merge "Support html5 video switching b/t full screen and inline mode" into honeycomb-mr1
Bart Sears [Thu, 17 Mar 2011 04:50:52 +0000 (21:50 -0700)]
am
8e42d39f: Merge "partial inval" into honeycomb-mr1
* commit '
8e42d39f0b1c2a60ab9c2f88cd3835ef8ae690ed':
partial inval
Bart Sears [Thu, 17 Mar 2011 04:49:09 +0000 (21:49 -0700)]
Merge "partial inval" into honeycomb-mr1
Alex Sakhartchouk [Thu, 17 Mar 2011 04:18:37 +0000 (21:18 -0700)]
am
55a9be3d: Merge "Fix for bug
3434228" into honeycomb-mr1
* commit '
55a9be3d284d17045d9d3546c57d9dc3c4c8a521':
Fix for bug
3434228
Alex Sakhartchouk [Thu, 17 Mar 2011 04:16:31 +0000 (21:16 -0700)]
Merge "Fix for bug
3434228" into honeycomb-mr1
Adam Cohen [Thu, 17 Mar 2011 01:03:23 +0000 (18:03 -0700)]
am
296c1616: Merge "Catching all Exceptions when calling through to RemoteViewsFactory" into honeycomb-mr1
* commit '
296c1616bad5a075cf64c2ba025b0cfd6bb3816d':
Catching all Exceptions when calling through to RemoteViewsFactory
Adam Cohen [Thu, 17 Mar 2011 01:02:08 +0000 (18:02 -0700)]
Merge "Catching all Exceptions when calling through to RemoteViewsFactory" into honeycomb-mr1
Romain Guy [Thu, 17 Mar 2011 00:26:41 +0000 (17:26 -0700)]
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
Romain Guy [Thu, 17 Mar 2011 00:24:32 +0000 (17:24 -0700)]
Merge "Modify the GL renderer's functor to pass the clip to WebView" into honeycomb-mr1
Eric Fischer [Thu, 17 Mar 2011 00:10:09 +0000 (17:10 -0700)]
am
20ccaf6c: Import revised translations. DO NOT MERGE
* commit '
20ccaf6cc1a79a3f7973e5875c66e2bce2ebee7c':
Import revised translations. DO NOT MERGE
Yu Shan Emily Lau [Wed, 16 Mar 2011 23:43:04 +0000 (16:43 -0700)]
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
Yu Shan Emily Lau [Wed, 16 Mar 2011 23:40:46 +0000 (16:40 -0700)]
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
Rajneesh Chowdury [Wed, 16 Mar 2011 23:05:54 +0000 (16:05 -0700)]
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)
Rajneesh Chowdury [Wed, 16 Mar 2011 23:03:15 +0000 (16:03 -0700)]
Merge "Fix for
4087846 Crash reported by monkey report (Java/Jni)" into honeycomb-mr1
Mathias Agopian [Wed, 16 Mar 2011 22:59:15 +0000 (15:59 -0700)]
am
af831a7b: Merge "fix [
4107131] nvidia driver call takes a very long time" into honeycomb-mr1
* commit '
af831a7bd5f1a3ffd1129f5f15b862c5973d48b6':
fix [
4107131] nvidia driver call takes a very long time
Mathias Agopian [Wed, 16 Mar 2011 22:57:57 +0000 (15:57 -0700)]
Merge "fix [
4107131] nvidia driver call takes a very long time" into honeycomb-mr1
Romain Guy [Wed, 16 Mar 2011 22:30:12 +0000 (15:30 -0700)]
Modify the GL renderer's functor to pass the clip to WebView
Change-Id: If5efe399ca58f3000b2883e24e9f3736a2025184
James Dong [Wed, 16 Mar 2011 22:11:03 +0000 (15:11 -0700)]
am
fc591762: Merge "Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file." into honeycomb-mr1
* commit '
fc59176241f498ad4eeb4237800c2eb5edd9efcd':
Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file.
James Dong [Wed, 16 Mar 2011 22:09:21 +0000 (15:09 -0700)]
Merge "Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file." into honeycomb-mr1
Shimeng (Simon) Wang [Wed, 16 Mar 2011 21:47:32 +0000 (14:47 -0700)]
am
464b690a: Pass firstLayout info to native webview when setting baseLayer.
* commit '
464b690ada24428f3dff4102659048db7128835f':
Pass firstLayout info to native webview when setting baseLayer.
Mathias Agopian [Wed, 16 Mar 2011 21:19:03 +0000 (14:19 -0700)]
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
Michael Kolb [Wed, 16 Mar 2011 20:34:30 +0000 (13:34 -0700)]
am
6bb2020e: Merge "add comment to deprecated tag" into honeycomb-mr1
* commit '
6bb2020e6e9914f6df3dc7d69dbd21782267fbd4':
add comment to deprecated tag
Andreas Huber [Wed, 16 Mar 2011 20:18:42 +0000 (13:18 -0700)]
am
46956b06: Merge "DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting." into honeycomb-mr1
* commit '
46956b0691b2a228237d17536fe4ad33a760c0af':
DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting.
Michael Kolb [Wed, 16 Mar 2011 20:10:48 +0000 (13:10 -0700)]
Merge "add comment to deprecated tag" into honeycomb-mr1
Andreas Huber [Wed, 16 Mar 2011 20:06:52 +0000 (13:06 -0700)]
Merge "DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting." into honeycomb-mr1
Mike Lockwood [Wed, 16 Mar 2011 19:06:58 +0000 (12:06 -0700)]
am
75d62cee: Merge "USB System UI: Improve message for the "no app for USB accessory" dialog." into honeycomb-mr1
* commit '
75d62cee30557145e48d792fdce4769235daa9ce':
USB System UI: Improve message for the "no app for USB accessory" dialog.
Mike Lockwood [Wed, 16 Mar 2011 19:03:39 +0000 (12:03 -0700)]
Merge "USB System UI: Improve message for the "no app for USB accessory" dialog." into honeycomb-mr1
Michael Kolb [Wed, 16 Mar 2011 18:35:45 +0000 (11:35 -0700)]
am
95fd065e: Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1
* commit '
95fd065e3cef0bef723a2e624191b08bb00ce6f8':
deprecate getVisibleTitleHeight
Michael Kolb [Wed, 16 Mar 2011 18:33:13 +0000 (11:33 -0700)]
Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1
Eric Fischer [Wed, 16 Mar 2011 17:51:56 +0000 (10:51 -0700)]
am
cc571e96: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '
cc571e9643865edc3f25aa133c467ace46ce8e80':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 16 Mar 2011 17:23:02 +0000 (10:23 -0700)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
Mike Lockwood [Wed, 16 Mar 2011 11:33:29 +0000 (04:33 -0700)]
am
ff51d29a: Merge "USB System UI: Fix string localization problems" into honeycomb-mr1
* commit '
ff51d29a0bbf7006833ad67b1aa8a52a8a9a2514':
USB System UI: Fix string localization problems
OSDN Git Service
