Jeff Brown
731b939de8
Merge "Add a new class to receive vsync events."
2011-12-05 21:19:41 -08:00
Jeff Brown
935fa02172
Merge "Refactor ValueAnimator to reduce use of ThreadLocals."
2011-12-05 21:19:38 -08:00
Mathias Agopian
82fbc9be7c
Merge "fix a deadlock when removing a DisplayEventConnection"
2011-12-05 21:14:03 -08:00
Jeff Brown
f697e5d6b5
Merge "Harfbuzz assumes the length of the item is at least 1."
2011-12-05 20:43:55 -08:00
Jeff Brown
65c1cc5fbd
Merge "Ensure log_clusters array is big enough."
2011-12-05 20:43:36 -08:00
Jeff Brown
a03bdedbdf
Harfbuzz assumes the length of the item is at least 1.
...
If the length is zero, then it will clobber memory at index -1
into the log_clusters array.
Explicitly handle the cases where the entire string or a single
run might have a length of 0.
Bug: 5705479
Change-Id: Ibbd3a4edcb7e1cad09c34091b42bb315776ea558
2011-12-05 20:33:50 -08:00
Jeff Brown
738ef87eac
Ensure log_clusters array is big enough.
...
Bug: 5714171
Change-Id: I886f1af8af177827f052e6406a192f2fad5c2cec
2011-12-05 20:24:21 -08:00
Matthew Xie
2016055a97
am 12479141: am 0d9a41e7: Merge "Broadcast turning on/off intent as early as possible when switch on/off BT" into ics-mr1
...
* commit '12479141dd3e63a5f26a4509d0922c9ef9e3d78c':
Broadcast turning on/off intent as early as possible when switch on/off BT
2011-12-05 20:00:46 -08:00
Mathias Agopian
2871ce953c
fix a deadlock when removing a DisplayEventConnection
...
the deadlock would happen when the pipe became invalid and SF
trying to remove the connection from its list.
we know make sure to process events without holding a lock.
Change-Id: I39927ed8824fc7811e16db3c7608a2ebc72d9642
2011-12-05 19:58:47 -08:00
Matthew Xie
12479141dd
am 0d9a41e7: Merge "Broadcast turning on/off intent as early as possible when switch on/off BT" into ics-mr1
...
* commit '0d9a41e74c81e8297ee439473c301a50da20cf0b':
Broadcast turning on/off intent as early as possible when switch on/off BT
2011-12-05 19:58:12 -08:00
Matthew Xie
0d9a41e74c
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
deb86c63c3
am ec42750e: am 0c0120ef: Merge "Fix issue #5714517 : App shortcuts can result in bad task intents" into ics-mr1
...
* commit 'ec42750e4d0e695515d078fb1f222c99a705fd93':
Fix issue #5714517 : App shortcuts can result in bad task intents
2011-12-05 19:20:45 -08:00
Dianne Hackborn
ec42750e4d
am 0c0120ef: Merge "Fix issue #5714517 : App shortcuts can result in bad task intents" into ics-mr1
...
* commit '0c0120efa2dedaf25ae789bced5a3f9fa33c32bb':
Fix issue #5714517 : App shortcuts can result in bad task intents
2011-12-05 19:18:34 -08:00
Dianne Hackborn
0c0120efa2
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
fc2e4f6d01
am 24ec8703: am 52245ac7: Merge "Fix issue #5713576 : Home redraws after returning from app on Nexus S 4G" into ics-mr1
...
* commit '24ec870322c801b0662d8b8d53232e89a94bc00a':
Fix issue #5713576 : Home redraws after returning from app on Nexus S 4G
2011-12-05 19:11:23 -08:00
Dianne Hackborn
24ec870322
am 52245ac7: Merge "Fix issue #5713576 : Home redraws after returning from app on Nexus S 4G" into ics-mr1
...
* commit '52245ac7c41735c561199d9ec7e9577d592ca852':
Fix issue #5713576 : Home redraws after returning from app on Nexus S 4G
2011-12-05 19:09:17 -08:00
Dianne Hackborn
52245ac7c4
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
e5d361a89f
am 83f79c90: am f66664a5: Merge "Fix sticky menu icon on tablet status bar." into ics-mr1
...
* commit '83f79c90989bab2758d5c7d232eb537fb2242e8b':
Fix sticky menu icon on tablet status bar.
2011-12-05 19:06:17 -08:00
Daniel Sandler
83f79c9098
am f66664a5: Merge "Fix sticky menu icon on tablet status bar." into ics-mr1
...
* commit 'f66664a50e914e1cc5d66046cfc4c5b195a09eab':
Fix sticky menu icon on tablet status bar.
2011-12-05 19:04:13 -08:00
Daniel Sandler
f66664a50e
Merge "Fix sticky menu icon on tablet status bar." into ics-mr1
2011-12-05 19:02:28 -08:00
Dianne Hackborn
77eaaf04c6
Fix issue #5713576 : Home redraws after returning from app on Nexus S 4G
...
Turn of destroying of activities during memory trimming.
Change-Id: Ibea415c13fca4f67f56adefe81a1495f5f9ad273
2011-12-05 19:00:42 -08:00
Adam Powell
16bf40b8c7
am 7cd1851d: am 9a856f4e: Merge "Drop API level for notification compatibility BG to 8 (from 10)" into ics-mr1
...
* commit '7cd1851d82bc44acd1bd6d36f2a5f1ebccaefabf':
Drop API level for notification compatibility BG to 8 (from 10)
2011-12-05 17:49:04 -08:00
Dianne Hackborn
f5b8671c34
Fix issue #5714517 : App shortcuts can result in bad task intents
...
New API to let you build an Intent whose base configuration is correct,
but has an additional "selector" to pick out the specific app that you
would like launched.
Change-Id: Ide9db6dc60e2844b7696cfe09b28337fe7dd63db
2011-12-05 17:42:41 -08:00
Adam Powell
7cd1851d82
am 9a856f4e: Merge "Drop API level for notification compatibility BG to 8 (from 10)" into ics-mr1
...
* commit '9a856f4ee7b49f735e31b57a09bee2f033ce20a5':
Drop API level for notification compatibility BG to 8 (from 10)
2011-12-05 17:40:18 -08:00
Adam Powell
9a856f4ee7
Merge "Drop API level for notification compatibility BG to 8 (from 10)" into ics-mr1
2011-12-05 17:38:23 -08:00
Matthew Xie
a6ba6fd4bb
Broadcast turning on/off intent as early as possible when switch on/off BT
...
Move broadcastState(BluetoothAdapter.STATE_TURNING_ON/OFF) before any other
method calls when turn on/off Bluetooth.
Bug 5703346
Change-Id: Iddbdab58367a7d648708aa23671eb09701d66793
2011-12-05 17:36:01 -08:00
Eric Laurent
53c52895be
am 5433e25f: am 7b6aff23: Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1
...
* commit '5433e25f6ce013860ff2a074ad8d1158cc39ab91':
audioflinger: fix audio skipping over A2DP
2011-12-05 17:25:37 -08:00
Eric Laurent
5433e25f6c
am 7b6aff23: Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1
...
* commit '7b6aff23735a9ef8759c5ecb4427784413e9b85b':
audioflinger: fix audio skipping over A2DP
2011-12-05 17:22:58 -08:00
Eric Laurent
7b6aff2373
Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1
2011-12-05 17:20:53 -08:00
Fred Quintana
e7851ea612
am f3f7d65b: am b5f2dfbc: 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
...
* commit 'f3f7d65b650dec7f4eacefa1f0174fadfce5ec6e':
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()
2011-12-05 16:49:37 -08:00
Fred Quintana
f3f7d65b65
am b5f2dfbc: 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
...
* commit 'b5f2dfbc221d3dc799232e0ada3b6621d3d4d597':
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()
2011-12-05 16:47:06 -08:00
Fred Quintana
b5f2dfbc22
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
7d6d55a69c
am cda010d5: am 3124e6f9: Merge "Remove debug log messages" into ics-mr1
...
* commit 'cda010d556552b533191d8bc90454c99c133549f':
Remove debug log messages
2011-12-05 16:33:01 -08:00
Xia Wang
1fd291144c
am 96f660f4: am e63d67ef: Merge "Add extra 2 minute for wifi to shutdown" into ics-mr1
...
* commit '96f660f4a8b99ff387e17474f2574e4e284ceeb8':
Add extra 2 minute for wifi to shutdown
2011-12-05 16:32:59 -08:00
Svetoslav Ganov
6a2b621c79
am 96de4c3b: am da926cf2: Merge "TalkBack does not announce properly the buttons of the PIN lock." into ics-mr1
...
* commit '96de4c3befe7cefac81b1d317f752ba76b9fe7ce':
TalkBack does not announce properly the buttons of the PIN lock.
2011-12-05 16:32:55 -08:00
Irfan Sheriff
86a394698f
am f81674ca: am 6b66e9e4: Switch to notifications for walled garden
...
* commit 'f81674ca5249313ce820ceb5329d82a2862abab6':
Switch to notifications for walled garden
2011-12-05 16:32:49 -08:00
Peter Ng
4774a216e5
am 9467d0bd: am 74b496dd: Merge "Numberpicker section divider is now 2dp thick" into ics-mr1
...
* commit '9467d0bde1e3b0065479f731236055e526664caa':
Numberpicker section divider is now 2dp thick
2011-12-05 16:32:44 -08:00
Eric Fischer
19c908a8a0
am ab50285a: am 845b3efc: Merge "Add missing locale date format files." into ics-mr1
...
* commit 'ab50285ae481e9d749048e80a3d1e79f8545c1ed':
Add missing locale date format files.
2011-12-05 16:32:42 -08:00
Michael Kolb
cda010d556
am 3124e6f9: Merge "Remove debug log messages" into ics-mr1
...
* commit '3124e6f9e96b730cdfbbf068f15c41b6d5c8a819':
Remove debug log messages
2011-12-05 16:13:49 -08:00
Michael Kolb
3124e6f9e9
Merge "Remove debug log messages" into ics-mr1
2011-12-05 16:12:35 -08:00
Xia Wang
96f660f4a8
am e63d67ef: Merge "Add extra 2 minute for wifi to shutdown" into ics-mr1
...
* commit 'e63d67eff794ba2e4e5d2aa9e8854b37329f4429':
Add extra 2 minute for wifi to shutdown
2011-12-05 15:55:27 -08:00
Xia Wang
e63d67eff7
Merge "Add extra 2 minute for wifi to shutdown" into ics-mr1
2011-12-05 15:52:34 -08:00
Fred Quintana
33e4469417
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()
Bug: 5713224
Change-Id: Ic8c42103f4031e1d7b1db797edcbbd7f7bac1387
2011-12-05 15:44:34 -08:00
Adam Powell
ad9deec87c
Drop API level for notification compatibility BG to 8 (from 10)
...
Bug 5713262
As we had concrete styles for achieving the right text styling as of
Gingerbread, don't punsh apps that used them correctly.
Change-Id: I1e373a0238edd6bdab2d0f96588d9cb92a20b31f
2011-12-05 15:38:51 -08:00
Svetoslav Ganov
96de4c3bef
am da926cf2: Merge "TalkBack does not announce properly the buttons of the PIN lock." into ics-mr1
...
* commit 'da926cf284ff5f5ccf91dec088ff64d442cee25c':
TalkBack does not announce properly the buttons of the PIN lock.
2011-12-05 15:04:31 -08:00
Svetoslav Ganov
da926cf284
Merge "TalkBack does not announce properly the buttons of the PIN lock." into ics-mr1
2011-12-05 15:03:13 -08:00
Michael Kolb
e4e5fef75e
Remove debug log messages
...
Bug: 5713163
Change-Id: Id8d9845f6ecb7dd90ae4cf42bc82d39a148a5700
2011-12-05 14:55:02 -08:00
Romain Guy
fe0d3523a5
Merge "Make sure onPostExecute() is never called after cancel() Bug #5651553 "
2011-12-05 14:50:54 -08:00
Romain Guy
657f51371c
Make sure onPostExecute() is never called after cancel()
...
Bug #5651553
As dfined by the documentation.
Change-Id: I627a49ee000d6990b61fd64dde9b06f72cd5cbae
2011-12-05 14:49:33 -08:00
Andreas Huber
714e0a6d54
Merge "resolved conflicts for merge of 07bacabe to master"
2011-12-05 14:26:22 -08:00