OSDN Git Service
Andreas Huber [Thu, 8 Dec 2011 21:33:16 +0000 (13:33 -0800)]
Merge "Don't perform RTSP seeks right away but queue them for 200ms" into ics-mr1
Andreas Huber [Thu, 8 Dec 2011 21:33:06 +0000 (13:33 -0800)]
Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1
Svetoslav Ganov [Thu, 8 Dec 2011 20:28:11 +0000 (12:28 -0800)]
Merge "NumberPicker getting stuck if scroll wheel not wrapable." into ics-mr1
Irfan Sheriff [Thu, 8 Dec 2011 20:21:20 +0000 (12:21 -0800)]
Merge "Handle emergency call back mode correctly" into ics-mr1
Gilles Debunne [Thu, 8 Dec 2011 19:57:06 +0000 (11:57 -0800)]
Merge "Make the Next key navigate between TextViews" into ics-mr1
Gilles Debunne [Thu, 8 Dec 2011 19:56:28 +0000 (11:56 -0800)]
Merge "Limit created string size in Spell Checker" into ics-mr1
Eric Fischer [Thu, 8 Dec 2011 19:09:11 +0000 (11:09 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
The Android Open Source Project [Thu, 8 Dec 2011 18:26:33 +0000 (10:26 -0800)]
Reconcile with ics-mr0-release
Change-Id: I2b2afc572c36ef210d81af16bd2e52cecdd94079
Gilles Debunne [Thu, 8 Dec 2011 17:59:44 +0000 (09:59 -0800)]
Merge "IOOB is Suggestions" into ics-mr1
Gilles Debunne [Thu, 8 Dec 2011 17:59:29 +0000 (09:59 -0800)]
Merge "Prevent NPE in SuggestionSpan" into ics-mr1
Jeff Tinker [Thu, 8 Dec 2011 08:13:43 +0000 (00:13 -0800)]
Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1
Jeff Brown [Thu, 8 Dec 2011 07:29:52 +0000 (23:29 -0800)]
Merge "Shortcut keys should be handled on down, not up." into ics-mr1
Jeff Brown [Thu, 8 Dec 2011 07:29:45 +0000 (23:29 -0800)]
Merge "Fix system hotkey handling." into ics-mr1
Dave Burke [Thu, 8 Dec 2011 04:40:10 +0000 (20:40 -0800)]
Merge "Remove dangerous and useless optimization Bug #
5525888" into ics-mr1
Wink Saville [Thu, 8 Dec 2011 04:15:45 +0000 (20:15 -0800)]
Merge "When the SIM_READY set current preferred network type." into ics-mr1
Jaikumar Ganesh [Thu, 8 Dec 2011 03:50:03 +0000 (19:50 -0800)]
Merge "Reduce likelihood of crash in state machine." into ics-mr1
John Wang [Thu, 8 Dec 2011 02:49:28 +0000 (18:49 -0800)]
Merge "Correct the dialing number of structured MMI." into ics-mr1
Gilles Debunne [Thu, 8 Dec 2011 02:41:04 +0000 (18:41 -0800)]
Merge "Insert into user dict with the correct locale" into ics-mr1
Adam Powell [Thu, 8 Dec 2011 01:55:35 +0000 (17:55 -0800)]
Merge "Raise touch slop value from previous experiment" into ics-mr1
Daniel Sandler [Thu, 8 Dec 2011 01:40:07 +0000 (17:40 -0800)]
Merge "Improve handling of small largeIcons in tablet ticker." into ics-mr1
Joe Malin [Thu, 8 Dec 2011 01:11:59 +0000 (17:11 -0800)]
am
3937e055: Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0
* commit '
3937e055708a8618f184feab204fed4bb41f3f6e':
DOC CHANGE: Add text for android.os.storage
Dianne Hackborn [Thu, 8 Dec 2011 01:11:57 +0000 (17:11 -0800)]
am
b32785c6: Merge "More fixing for issue #
5366535: Lockscreen has wrong layout..." into ics-mr0
* commit '
b32785c6e893743956e28b285b8e6f6fc7aa8edb':
More fixing for issue #
5366535: Lockscreen has wrong layout...
Dianne Hackborn [Thu, 8 Dec 2011 01:10:34 +0000 (17:10 -0800)]
Merge "Merge commit '
eee12419' into manualmerge" into ics-mr1
Robert Greenwalt [Thu, 8 Dec 2011 01:09:05 +0000 (17:09 -0800)]
Merge "Fix NPE in trimV4AddrZeros." into ics-mr1
Amith Yamasani [Thu, 8 Dec 2011 00:54:31 +0000 (16:54 -0800)]
Merge "Make new ringer toggles on power menu accessible and navigable with keyboard." into ics-mr1
Daniel Sandler [Thu, 8 Dec 2011 00:33:31 +0000 (16:33 -0800)]
Merge "Invalidate the whole status bar after layout transitions." into ics-mr1
Dianne Hackborn [Thu, 8 Dec 2011 00:33:15 +0000 (16:33 -0800)]
Merge commit '
eee12419' into manualmerge
Russell Brenner [Thu, 8 Dec 2011 00:20:15 +0000 (16:20 -0800)]
Merge "Update Armenian and Georgian fonts" into ics-mr1
Joe Malin [Thu, 8 Dec 2011 00:07:49 +0000 (16:07 -0800)]
Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0
Dianne Hackborn [Wed, 7 Dec 2011 23:22:21 +0000 (15:22 -0800)]
Merge "More fixing for issue #
5366535: Lockscreen has wrong layout..." into ics-mr0
Jeff Brown [Wed, 7 Dec 2011 23:04:39 +0000 (15:04 -0800)]
Merge "Make the dock orientation override the HDMI orientation." into ics-mr1
Dianne Hackborn [Wed, 7 Dec 2011 23:01:55 +0000 (15:01 -0800)]
Merge "Fix issue #
5144065: Tap on Music icon from Home screen..." into ics-mr1
Dianne Hackborn [Wed, 7 Dec 2011 23:00:05 +0000 (15:00 -0800)]
Merge "DO NOT MERGE. Integrate from MR 1 to fix issue #
5366535: Lockscreen..." into ics-mr0
Winson Chung [Wed, 7 Dec 2011 22:33:31 +0000 (14:33 -0800)]
Merge "Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug
5703782)" into ics-mr1
Dave Burke [Wed, 7 Dec 2011 22:05:41 +0000 (14:05 -0800)]
Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1
Robert Greenwalt [Wed, 7 Dec 2011 20:29:14 +0000 (12:29 -0800)]
Merge "Trim leading zeros from ipv4 addrs." into ics-mr1
Irfan Sheriff [Wed, 7 Dec 2011 20:06:31 +0000 (12:06 -0800)]
Merge "Fix CS wakelock handling" into ics-mr1
Bart Sears [Wed, 7 Dec 2011 19:41:57 +0000 (11:41 -0800)]
Merge "Fix WebTextView rings" into ics-mr1
Joe Malin [Wed, 7 Dec 2011 19:28:25 +0000 (11:28 -0800)]
am
9e2cf49f: Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0
* commit '
9e2cf49fa360e70b33a870e9ae0b3eec11752972':
DOC CHANGE: Add Content URI ref doc
Joe Malin [Wed, 7 Dec 2011 19:26:20 +0000 (11:26 -0800)]
Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0
Dianne Hackborn [Wed, 7 Dec 2011 18:33:19 +0000 (10:33 -0800)]
Merge "Truthiness is good." into ics-mr1
The Android Open Source Project [Wed, 7 Dec 2011 15:24:54 +0000 (07:24 -0800)]
Reconcile with ics-mr0-release
Change-Id: I5341d7d7de8ec8dfa86095e8d8d45a912bb01a47
Irfan Sheriff [Wed, 7 Dec 2011 05:06:03 +0000 (21:06 -0800)]
Merge "Disable poor network connection alone" into ics-mr1
Scott Main [Wed, 7 Dec 2011 01:12:53 +0000 (17:12 -0800)]
am
b6322a5b: docs: fix broken links bug:
5542371
* commit '
b6322a5bb9fda370cccf89434b939370dfa36b02':
docs: fix broken links bug:
5542371
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.