Andreas Huber
325e028e16
Merge commit 'babb7200' into manualmerge
2011-12-06 15:03:10 -08:00
Adam Powell
6e5c8b6b4f
Merge "Lower touch slop in ViewConfiguration." into ics-mr1
2011-12-06 13:58:20 -08:00
James Dong
102c083007
Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1
2011-12-06 12:52:52 -08:00
Andreas Huber
047dc0fd96
Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1
2011-12-06 12:44:53 -08:00
Andreas Huber
6ac5344822
Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr0
2011-12-06 12:11:38 -08:00
Irfan Sheriff
e2f918580a
am 7b62313e: Disable wifiwatchdog for now
...
* commit '7b62313eab4af8835a64fb3fe1e15e5e534a9479':
Disable wifiwatchdog for now
2011-12-06 11:34:58 -08:00
Gilles Debunne
1e41509302
Merge "Invalidated bounds tightened in TextView" into ics-mr1
2011-12-06 11:20:18 -08:00
Eric Fischer
36a9a06f12
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-12-06 10:34:41 -08:00
Svetoslav Ganov
d10d9b0c05
Merge "Adding a system preference whether to speak passwords in accessibility mode." into ics-mr1
2011-12-06 10:27:04 -08:00
Jeff Brown
3e22f421dc
Merge "Fix memory corruption issues in TextLayoutCache. (DO NOT MERGE)" into ics-mr1
2011-12-05 22:50:49 -08:00
Jim Miller
a389059345
Merge "Fix 5705837: Dismiss keyguard when launching Settings from Statusbar" into ics-mr1
2011-12-05 22:12:54 -08:00
Jesse Hall
ed7d42a38c
Merge "Fix statusbar crash on devices with no Bluetooth" into ics-mr1
2011-12-05 21:23:29 -08:00
Matthew Xie
7f87a886c2
Merge "Broadcast turning on/off intent as early as possible when switch on/off BT" into ics-mr1
2011-12-05 19:56:54 -08:00
Dianne Hackborn
de63dc278a
Merge "Fix issue #5714517 : App shortcuts can result in bad task intents" into ics-mr1
2011-12-05 19:16:54 -08:00
Dianne Hackborn
e7c5236937
Merge "Fix issue #5713576 : Home redraws after returning from app on Nexus S 4G" into ics-mr1
2011-12-05 19:07:52 -08:00
Daniel Sandler
a13e242710
Merge "Fix sticky menu icon on tablet status bar." into ics-mr1
2011-12-05 19:02:28 -08:00
Adam Powell
64fb290a92
Merge "Drop API level for notification compatibility BG to 8 (from 10)" into ics-mr1
2011-12-05 17:38:23 -08:00
Eric Laurent
cb512470c5
Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1
2011-12-05 17:20:53 -08:00
Fred Quintana
9a6f415353
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
2011-12-05 16:45:29 -08:00
Michael Kolb
fcc6543339
Merge "Remove debug log messages" into ics-mr1
2011-12-05 16:12:35 -08:00
Xia Wang
89b1dac8b1
Merge "Add extra 2 minute for wifi to shutdown" into ics-mr1
2011-12-05 15:52:34 -08:00
Svetoslav Ganov
797fca9027
Merge "TalkBack does not announce properly the buttons of the PIN lock." into ics-mr1
2011-12-05 15:03:13 -08:00
Peter Ng
98c0f73407
Merge "Numberpicker section divider is now 2dp thick" into ics-mr1
2011-12-05 12:34:53 -08:00
Eric Fischer
b593c4b82e
Merge "Add missing locale date format files." into ics-mr1
2011-12-05 12:25:58 -08:00
Andreas Huber
3174be1013
Merge "Properly identify how much metadata we need to cache in order to instantiate" into ics-mr1
2011-12-05 12:01:26 -08:00
Dianne Hackborn
72516bcb52
Merge "Fix issue #5614559 : Registering surface error in..." into ics-mr1
2011-12-05 10:40:59 -08:00
Michael Kolb
d5de02094d
Merge "set System UI visibility based on MediaController state" into ics-mr1
2011-12-05 09:24:25 -08:00
Jesse Hall
7d9f44c2f0
Merge "SurfaceFlinger: fix layer removal race condition" into ics-mr1
2011-12-02 18:31:03 -08:00
Robert Greenwalt
d76faf3963
Merge "Be careful sharing connections when dun is in play" into ics-mr1
2011-12-02 16:52:29 -08:00
Gilles Debunne
557266f89a
Merge "Handle animations in Views' rectangle clipping methods." into ics-mr1
2011-12-02 15:28:56 -08:00
John Reck
4ca57ef165
Merge "Fix updateDoubleTapZoom logic" into ics-mr1
2011-12-02 14:47:04 -08:00
Mike Lockwood
128a09d9b1
Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1
2011-12-02 13:20:49 -08:00
Mike Lockwood
1740eee1d0
Merge "MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE" into ics-mr1
2011-12-02 13:20:39 -08:00
Chia-chi Yeh
6c8163c640
am 431c3e4c: Merge "Documentation for the VPN sample for ICS SDK. Staging server: http://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
2011-12-02 12:46:51 -08:00
Chia-chi Yeh
f17b809ba0
Merge "Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html " into ics-mr0
2011-12-02 12:45:44 -08:00
Jesse Hall
00dbb097dc
Merge "Disable GLES20Canvas on emu w/o native GL" into ics-mr1
2011-12-02 12:33:20 -08:00
Roman Nurik
f7f7fff40b
am cd0e446d: Merge "Reduce file size for ADL presentation shareable." into ics-mr0
...
* commit 'cd0e446dc8de4b639df889ec3b5754bea60d752a':
Reduce file size for ADL presentation shareable.
2011-12-02 11:59:07 -08:00
Roman Nurik
9208d65973
Merge "Reduce file size for ADL presentation shareable." into ics-mr0
2011-12-02 11:57:03 -08:00
Amith Yamasani
66b39bd67c
Merge "Further volume improvements." into ics-mr1
2011-12-02 11:22:32 -08:00
Gilles Debunne
99b26e5406
Merge "(de)activating spell check taken into account immediately" into ics-mr1
2011-12-02 10:45:25 -08:00
Jesse Hall
2f4b68d21c
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
2011-12-02 10:03:25 -08:00
Hong Teng
71ebfa771d
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
2011-12-02 09:32:02 -08:00
Ben Cheng
d2e9b6b007
Merge "Initialize bwr.read_buffer in IPCThreadState::talkWithDriver." into ics-mr1
2011-12-01 22:05:07 -08:00
Eric Laurent
c603733c20
Merge "AudioService: strengthen A2DP device detection" into ics-mr1
2011-12-01 20:34:08 -08:00
Dianne Hackborn
5405705e67
Merge "More social integration." into ics-mr1
2011-12-01 18:48:32 -08:00
Ben Cheng
d640f89205
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
2011-12-01 17:11:32 -08:00
Gilles Debunne
afdc18bb0c
Merge "Scroll performance improved in multiline TextEdit" into ics-mr1
2011-12-01 15:04:35 -08:00
Gilles Debunne
d72b461ae6
Merge "Performance improvement in TextView" into ics-mr1
2011-12-01 15:03:55 -08:00
Gilles Debunne
ff8f841f12
Merge "Better handles' visibility test" into ics-mr1
2011-12-01 15:03:27 -08:00
Winson Chung
21a50fdd03
Merge "Adding a sound when you take a screenshot. (Bug 5617734)" into ics-mr1
2011-12-01 14:55:41 -08:00