OSDN Git Service
Andreas Huber [Wed, 7 Dec 2011 00:20:01 +0000 (16:20 -0800)]
Merge "Merge commit '
babb7200' into manualmerge" into ics-mr1
Fabrice Di Meglio [Tue, 6 Dec 2011 23:47:27 +0000 (15:47 -0800)]
Merge "Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)" into ics-mr1
Hong Teng [Tue, 6 Dec 2011 23:37:25 +0000 (15:37 -0800)]
Merge "Fix for issue
5712743 video editor functional test : testPreviewDuringExport fails -Correct the invalid filename, which contains control character. And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime." into ics-mr1
Amith Yamasani [Tue, 6 Dec 2011 23:36:10 +0000 (15:36 -0800)]
Merge "New and improved silent mode on lockscreen." into ics-mr1
Andreas Huber [Tue, 6 Dec 2011 23:03:10 +0000 (15:03 -0800)]
Merge commit '
babb7200' into manualmerge
Adam Powell [Tue, 6 Dec 2011 21:58:20 +0000 (13:58 -0800)]
Merge "Lower touch slop in ViewConfiguration." into ics-mr1
James Dong [Tue, 6 Dec 2011 20:52:52 +0000 (12:52 -0800)]
Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1
Andreas Huber [Tue, 6 Dec 2011 20:44:53 +0000 (12:44 -0800)]
Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1
Andreas Huber [Tue, 6 Dec 2011 20:11:38 +0000 (12:11 -0800)]
Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr0
Irfan Sheriff [Tue, 6 Dec 2011 19:34:58 +0000 (11:34 -0800)]
am
7b62313e: Disable wifiwatchdog for now
* commit '
7b62313eab4af8835a64fb3fe1e15e5e534a9479':
Disable wifiwatchdog for now
Gilles Debunne [Tue, 6 Dec 2011 19:20:18 +0000 (11:20 -0800)]
Merge "Invalidated bounds tightened in TextView" into ics-mr1
Eric Fischer [Tue, 6 Dec 2011 18:34:41 +0000 (10:34 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Svetoslav Ganov [Tue, 6 Dec 2011 18:27:04 +0000 (10:27 -0800)]
Merge "Adding a system preference whether to speak passwords in accessibility mode." into ics-mr1
Jeff Brown [Tue, 6 Dec 2011 06:50:49 +0000 (22:50 -0800)]
Merge "Fix memory corruption issues in TextLayoutCache. (DO NOT MERGE)" into ics-mr1
Jim Miller [Tue, 6 Dec 2011 06:12:54 +0000 (22:12 -0800)]
Merge "Fix
5705837: Dismiss keyguard when launching Settings from Statusbar" into ics-mr1
Jesse Hall [Tue, 6 Dec 2011 05:23:29 +0000 (21:23 -0800)]
Merge "Fix statusbar crash on devices with no Bluetooth" into ics-mr1
Matthew Xie [Tue, 6 Dec 2011 03:56:54 +0000 (19:56 -0800)]
Merge "Broadcast turning on/off intent as early as possible when switch on/off BT" into ics-mr1
Dianne Hackborn [Tue, 6 Dec 2011 03:16:54 +0000 (19:16 -0800)]
Merge "Fix issue #
5714517: App shortcuts can result in bad task intents" into ics-mr1
Dianne Hackborn [Tue, 6 Dec 2011 03:07:52 +0000 (19:07 -0800)]
Merge "Fix issue #
5713576: Home redraws after returning from app on Nexus S 4G" into ics-mr1
Daniel Sandler [Tue, 6 Dec 2011 03:02:28 +0000 (19:02 -0800)]
Merge "Fix sticky menu icon on tablet status bar." into ics-mr1
Adam Powell [Tue, 6 Dec 2011 01:38:23 +0000 (17:38 -0800)]
Merge "Drop API level for notification compatibility BG to 8 (from 10)" into ics-mr1
Eric Laurent [Tue, 6 Dec 2011 01:20:53 +0000 (17:20 -0800)]
Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1
Fred Quintana [Tue, 6 Dec 2011 00:45:29 +0000 (16:45 -0800)]
Merge "By default ICS allows two syncs to run in parallel. Make it only do one at a time for devices that don't have much RAM as defined by the call ActivityManager.isLargeRAM()" into ics-mr1
Michael Kolb [Tue, 6 Dec 2011 00:12:35 +0000 (16:12 -0800)]
Merge "Remove debug log messages" into ics-mr1
Xia Wang [Mon, 5 Dec 2011 23:52:34 +0000 (15:52 -0800)]
Merge "Add extra 2 minute for wifi to shutdown" into ics-mr1
Svetoslav Ganov [Mon, 5 Dec 2011 23:03:13 +0000 (15:03 -0800)]
Merge "TalkBack does not announce properly the buttons of the PIN lock." into ics-mr1
Peter Ng [Mon, 5 Dec 2011 20:34:53 +0000 (12:34 -0800)]
Merge "Numberpicker section divider is now 2dp thick" into ics-mr1
Eric Fischer [Mon, 5 Dec 2011 20:25:58 +0000 (12:25 -0800)]
Merge "Add missing locale date format files." into ics-mr1
Andreas Huber [Mon, 5 Dec 2011 20:01:26 +0000 (12:01 -0800)]
Merge "Properly identify how much metadata we need to cache in order to instantiate" into ics-mr1
Dianne Hackborn [Mon, 5 Dec 2011 18:40:59 +0000 (10:40 -0800)]
Merge "Fix issue #
5614559: Registering surface error in..." into ics-mr1
Michael Kolb [Mon, 5 Dec 2011 17:24:25 +0000 (09:24 -0800)]
Merge "set System UI visibility based on MediaController state" into ics-mr1
Jesse Hall [Sat, 3 Dec 2011 02:31:03 +0000 (18:31 -0800)]
Merge "SurfaceFlinger: fix layer removal race condition" into ics-mr1
Robert Greenwalt [Sat, 3 Dec 2011 00:52:29 +0000 (16:52 -0800)]
Merge "Be careful sharing connections when dun is in play" into ics-mr1
Gilles Debunne [Fri, 2 Dec 2011 23:28:56 +0000 (15:28 -0800)]
Merge "Handle animations in Views' rectangle clipping methods." into ics-mr1
John Reck [Fri, 2 Dec 2011 22:47:04 +0000 (14:47 -0800)]
Merge "Fix updateDoubleTapZoom logic" into ics-mr1
Mike Lockwood [Fri, 2 Dec 2011 21:20:49 +0000 (13:20 -0800)]
Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1
Mike Lockwood [Fri, 2 Dec 2011 21:20:39 +0000 (13:20 -0800)]
Merge "MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE" into ics-mr1
Chia-chi Yeh [Fri, 2 Dec 2011 20:46:51 +0000 (12:46 -0800)]
am
431c3e4c: Merge "Documentation for the VPN sample for ICS SDK. Staging server: fredchung.i:9999/resources/samples/ToyVpn/index.html" into ics-mr0
* commit '
431c3e4c7e2103865a90501a552b4e5145ed3f35':
Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html
Chia-chi Yeh [Fri, 2 Dec 2011 20:45:44 +0000 (12:45 -0800)]
Merge "Documentation for the VPN sample for ICS SDK. Staging server: fredchung.i:9999/resources/samples/ToyVpn/index.html" into ics-mr0
Jesse Hall [Fri, 2 Dec 2011 20:33:20 +0000 (12:33 -0800)]
Merge "Disable GLES20Canvas on emu w/o native GL" into ics-mr1
Roman Nurik [Fri, 2 Dec 2011 19:59:07 +0000 (11:59 -0800)]
am
cd0e446d: Merge "Reduce file size for ADL presentation shareable." into ics-mr0
* commit '
cd0e446dc8de4b639df889ec3b5754bea60d752a':
Reduce file size for ADL presentation shareable.
Roman Nurik [Fri, 2 Dec 2011 19:57:03 +0000 (11:57 -0800)]
Merge "Reduce file size for ADL presentation shareable." into ics-mr0
Amith Yamasani [Fri, 2 Dec 2011 19:22:32 +0000 (11:22 -0800)]
Merge "Further volume improvements." into ics-mr1
Gilles Debunne [Fri, 2 Dec 2011 18:45:25 +0000 (10:45 -0800)]
Merge "(de)activating spell check taken into account immediately" into ics-mr1
Jesse Hall [Fri, 2 Dec 2011 18:00:00 +0000 (10:00 -0800)]
SurfaceFlinger: fix layer removal race condition
Layer::lockPageFlip() and layer::onRemove() could be called on
different threads and race such that lockPageFlip() successfully
called mSurfaceTexture->updateTexImage() but then gets NULL back from
mSurfaceTexture->getCurrentBuffer(), leading to a crash.
This change moves Layer::onRemove() calls to
SurfaceFlinger::commitTransaction() so they happen after the Layer is
done being drawn from and only happen on the main surfaceflinger
thread.
Change-Id: I4b550caadff4cc1878d7c3bca6129193fb0c713e
Hong Teng [Fri, 2 Dec 2011 17:32:02 +0000 (09:32 -0800)]
Merge "Fixd for
5490443 Native crash while exporting a video - Add new onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification, the application must implement the onError method, and then VideoEditorPreviewTest.java is changed accordingly." into ics-mr1
Ben Cheng [Fri, 2 Dec 2011 06:05:07 +0000 (22:05 -0800)]
Merge "Initialize bwr.read_buffer in IPCThreadState::talkWithDriver." into ics-mr1
Eric Laurent [Fri, 2 Dec 2011 04:34:08 +0000 (20:34 -0800)]
Merge "AudioService: strengthen A2DP device detection" into ics-mr1
Dianne Hackborn [Fri, 2 Dec 2011 02:48:32 +0000 (18:48 -0800)]
Merge "More social integration." into ics-mr1
Ben Cheng [Fri, 2 Dec 2011 01:11:32 +0000 (17:11 -0800)]
Initialize bwr.read_buffer in IPCThreadState::talkWithDriver.
I/valgrind( 1309): ==1310== Syscall param
ioctl(BINDER_WRITE_READ).read_buffer points to uninitialised byte(s)
I/valgrind( 1309): ==1310== at 0x480E670: __ioctl (__ioctl.S:10)
I/valgrind( 1309): ==1310== Address 0xbda651b4 is on thread 1's stack
Change-Id: I02893df7b5786b6b2dbd9659f5706d7171295ab2
Gilles Debunne [Thu, 1 Dec 2011 23:04:35 +0000 (15:04 -0800)]
Merge "Scroll performance improved in multiline TextEdit" into ics-mr1
Gilles Debunne [Thu, 1 Dec 2011 23:03:55 +0000 (15:03 -0800)]
Merge "Performance improvement in TextView" into ics-mr1
Gilles Debunne [Thu, 1 Dec 2011 23:03:27 +0000 (15:03 -0800)]
Merge "Better handles' visibility test" into ics-mr1
Winson Chung [Thu, 1 Dec 2011 22:55:41 +0000 (14:55 -0800)]
Merge "Adding a sound when you take a screenshot. (Bug
5617734)" into ics-mr1
Kenny Root [Thu, 1 Dec 2011 22:14:22 +0000 (14:14 -0800)]
Merge "Fix free_cache to actually work" into ics-mr1
Roman Nurik [Thu, 1 Dec 2011 21:42:23 +0000 (13:42 -0800)]
am
c3998ced: Merge "Update widget design guidelines for padding and 8dp." into ics-mr0
* commit '
c3998ced746ee97bc5f10a9de1b2848f85c8711e':
Update widget design guidelines for padding and 8dp.
Roman Nurik [Thu, 1 Dec 2011 21:40:38 +0000 (13:40 -0800)]
Merge "Update widget design guidelines for padding and 8dp." into ics-mr0
Matthew Xie [Thu, 1 Dec 2011 21:32:19 +0000 (13:32 -0800)]
Merge "Unlink the Binder DeathRecipient when removing a Bluetooth service record" into ics-mr1
Svetoslav Ganov [Thu, 1 Dec 2011 20:57:12 +0000 (12:57 -0800)]
Merge "Fix memory leaks in the accessibility layer." into ics-mr1
Dianne Hackborn [Thu, 1 Dec 2011 20:47:43 +0000 (12:47 -0800)]
Merge "Improve how we manage the previous app." into ics-mr1
Daniel Sandler [Thu, 1 Dec 2011 20:09:51 +0000 (12:09 -0800)]
Merge "Add copious navigation bar info to SystemUI dumps." into ics-mr1
Bill Gruber [Thu, 1 Dec 2011 19:54:57 +0000 (11:54 -0800)]
am
92ad16d3: Merge "Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug
5221766" into ics-mr0
* commit '
92ad16d342aa4d39bad33600161b3799b84716f3':
Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug
5221766
Scott Main [Thu, 1 Dec 2011 19:54:55 +0000 (11:54 -0800)]
am
8f3993b1: Merge "docs: dashboard update for 12/1" into ics-mr0
* commit '
8f3993b12b52ac5d94d84376ec4f42b130018429':
docs: dashboard update for 12/1
Bill Gruber [Thu, 1 Dec 2011 19:53:23 +0000 (11:53 -0800)]
Merge "Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug
5221766" into ics-mr0
Scott Main [Thu, 1 Dec 2011 19:53:17 +0000 (11:53 -0800)]
Merge "docs: dashboard update for 12/1" into ics-mr0
Amith Yamasani [Thu, 1 Dec 2011 19:35:30 +0000 (11:35 -0800)]
Merge "No clicking on volume icon in volume dialog." into ics-mr1
Scott Main [Thu, 1 Dec 2011 19:20:03 +0000 (11:20 -0800)]
am
acf1038a: docs: remove broken link from renderscript docs bug:
5696178
* commit '
acf1038a260d7b2a3bb6b36058da47041c8ec173':
docs: remove broken link from renderscript docs bug:
5696178
Gilles Debunne [Thu, 1 Dec 2011 18:22:15 +0000 (10:22 -0800)]
Merge "TextViews keep focus after Done" into ics-mr1
Gilles Debunne [Thu, 1 Dec 2011 18:21:59 +0000 (10:21 -0800)]
Merge "Revert "IME action (done, next...) correctly handled"" into ics-mr1
Andreas Huber [Thu, 1 Dec 2011 18:18:19 +0000 (10:18 -0800)]
Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1
Robert Greenwalt [Thu, 1 Dec 2011 17:42:13 +0000 (09:42 -0800)]
Merge "Fix state synchronization problem." into ics-mr1
Ben Murdoch [Thu, 1 Dec 2011 17:03:22 +0000 (09:03 -0800)]
Merge "Fix crash with HTML5 video." into ics-mr1
Daniel Sandler [Thu, 1 Dec 2011 14:29:53 +0000 (06:29 -0800)]
Merge "Put screensavers back in the icebox for now. DO NOT MERGE." into ics-mr1
Bart Sears [Thu, 1 Dec 2011 06:29:16 +0000 (22:29 -0800)]
Merge "fix position of WebTextView on scrolling layers" into ics-mr1
Adam Cohen [Thu, 1 Dec 2011 05:10:27 +0000 (21:10 -0800)]
Merge "Working around issue where setting min height on RelativeLayout causes items to collapse. (Bug
5640357)" into ics-mr1
Dianne Hackborn [Thu, 1 Dec 2011 04:49:21 +0000 (20:49 -0800)]
Merge "Fix issue #
5433192 and maybe #
5433192" into ics-mr1
satok [Thu, 1 Dec 2011 01:37:52 +0000 (17:37 -0800)]
Merge "Fix ConcurrentModificationException in TextServicesManagerService" into ics-mr1
Svetoslav Ganov [Thu, 1 Dec 2011 00:56:41 +0000 (16:56 -0800)]
Merge "Fixing memory leaks in the accessiiblity layer." into ics-mr1
Dianne Hackborn [Wed, 30 Nov 2011 22:12:44 +0000 (14:12 -0800)]
Merge "Fix issue #
5679504: Device stuck and sudden reboot - Watchdog reset?" into ics-mr1
Dianne Hackborn [Wed, 30 Nov 2011 22:11:17 +0000 (14:11 -0800)]
Merge "Turn off debug log." into ics-mr1
Romain Guy [Wed, 30 Nov 2011 22:07:34 +0000 (14:07 -0800)]
Merge "Cache drawable constant states instead of drawables Bug #
5678369" into ics-mr1
Mathias Agopian [Wed, 30 Nov 2011 21:52:21 +0000 (13:52 -0800)]
Merge "add a way to access the version string of the h/w implementation of EGL" into ics-mr1
Daniel Sandler [Wed, 30 Nov 2011 19:54:17 +0000 (11:54 -0800)]
Merge "Expanding NotificationManager's event logging." into ics-mr1
Jeff Sharkey [Wed, 30 Nov 2011 19:44:54 +0000 (11:44 -0800)]
Merge "Avoid airplane mode labels when Wi-Fi enabled." into ics-mr1
Svetoslav Ganov [Wed, 30 Nov 2011 18:25:42 +0000 (10:25 -0800)]
Merge "NumberPicker incorrectly shown for the old theme." into ics-mr1
Dianne Hackborn [Wed, 30 Nov 2011 18:20:29 +0000 (10:20 -0800)]
Merge "Fix issue #
5628789: Cannot set static/custom wallpaper after clearing Settings data" into ics-mr1
Mathias Agopian [Wed, 30 Nov 2011 01:55:46 +0000 (17:55 -0800)]
add a way to access the version string of the h/w implementation of EGL
we use a hidden egl extension. the version string is printed
in SF's dumpsys log.
Change-Id: I123eb4bde6de462bb2404c67b74d6d6219a48d6a
Mathias Agopian [Wed, 30 Nov 2011 01:46:35 +0000 (17:46 -0800)]
Merge changes I7e973a35,Ib3386fcc into ics-mr1
* changes:
SurfaceTexture: add EGL_KHR_fence_sync option
SurfaceTexture: add a blit-to-FBO test
Jamie Gennis [Wed, 30 Nov 2011 01:25:09 +0000 (17:25 -0800)]
Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1
Jamie Gennis [Mon, 14 Nov 2011 22:51:01 +0000 (14:51 -0800)]
SurfaceTexture: add EGL_KHR_fence_sync option
This change adds a compile-time option for SurfaceTexture to use the
EGL_KHR_fence_sync extension to synchronize access to Gralloc buffers.
Bug:
5122031
Change-Id: I7e973a358631fff5308acf377581b811911fe790
Chris Craik [Wed, 30 Nov 2011 00:55:47 +0000 (16:55 -0800)]
Merge "Send animation start notification back to webkit from ui thread" into ics-mr1
Dianne Hackborn [Tue, 29 Nov 2011 23:28:41 +0000 (15:28 -0800)]
Merge "Fix issue #
5636525: ANR observed in setup wizard after changing language" into ics-mr1
Jamie Gennis [Sat, 12 Nov 2011 02:05:11 +0000 (18:05 -0800)]
SurfaceTexture: add a blit-to-FBO test
This change adds a test for blitting (via GL rendering) from a
SurfaceTexture to an FBO.
Change-Id: Ib3386fcc3f37153277f3e37a26347441bb80ab58
Teng-Hui Zhu [Tue, 29 Nov 2011 22:18:27 +0000 (14:18 -0800)]
Merge "WebView animation support" into ics-mr1
Romain Guy [Tue, 29 Nov 2011 22:14:44 +0000 (14:14 -0800)]
Merge "Improve screenshot animation performance Bug #
5525888" into ics-mr1
Andreas Huber [Tue, 29 Nov 2011 22:09:10 +0000 (14:09 -0800)]
Merge "Make sure we can properly shutdown even if" into ics-mr1
Andreas Huber [Tue, 29 Nov 2011 22:09:03 +0000 (14:09 -0800)]
Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1
Andreas Huber [Tue, 29 Nov 2011 22:08:45 +0000 (14:08 -0800)]
Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1
Andreas Huber [Tue, 29 Nov 2011 22:08:13 +0000 (14:08 -0800)]
Merge "Finer granularity discontinuity support." into ics-mr1
Jeff Brown [Tue, 29 Nov 2011 21:13:33 +0000 (13:13 -0800)]
Merge "Fix application launch shortcuts." into ics-mr1