OSDN Git Service
Joe Malin [Wed, 7 Dec 2011 19:30:41 +0000 (11:30 -0800)]
am
3744d1fa: am
9e2cf49f: Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0
* commit '
3744d1faf582214132b9ba000d54cdbf44425113':
DOC CHANGE: Add Content URI ref doc
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:36:54 +0000 (10:36 -0800)]
am
fb90df8c: Merge "Truthiness is good." into ics-mr1
* commit '
fb90df8c6e6d48c4b6701014a3053915b94f4b9e':
Truthiness is good.
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:27:57 +0000 (07:27 -0800)]
am
3de8d36b: Reconcile with ics-mr0-release
* commit '
3de8d36b6fd166cf63ca256c455c0ea26a849668':
DO NOT MERGE: Remove the AVI extractor.
Disable wifiwatchdog for now
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:07:36 +0000 (21:07 -0800)]
am
8a4cd3b1: Merge "Disable poor network connection alone" into ics-mr1
* commit '
8a4cd3b1053d92ecb34628218f303343746691f4':
Disable poor network connection alone
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:14:50 +0000 (17:14 -0800)]
am
0a83e9d4: am
b6322a5b: docs: fix broken links bug:
5542371
* commit '
0a83e9d438f35cba62a10392fb9e7e1c577aa638':
docs: fix broken links bug:
5542371
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
Scott Main [Wed, 7 Dec 2011 01:09:37 +0000 (17:09 -0800)]
docs: fix broken links
bug:
5542371
Change-Id: If04b39918a54ccc163d255bf75d566f1875dac0a
Andreas Huber [Wed, 7 Dec 2011 00:22:07 +0000 (16:22 -0800)]
am
791a3183: Merge "Merge commit \'
babb7200\' into manualmerge" into ics-mr1
* commit '
791a31832ab586f056c2bcab8e0515d4bb1e2f7a':
DO NOT MERGE: Remove the AVI extractor.
Irfan Sheriff [Tue, 6 Dec 2011 22:41:14 +0000 (14:41 -0800)]
Disable poor network connection alone
- Keep the walled garden detection in place
Bug:
5719771
Change-Id: I9e5d69b6d56096be904106b1db48c02db4c0fb50
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:49:29 +0000 (15:49 -0800)]
am
1e994211: Merge "Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)" into ics-mr1
* commit '
1e99421196c1b34363267d6e6f02b16a299c9012':
Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)
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:39:37 +0000 (15:39 -0800)]
am
6db79c35: 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." int
* commit '
6db79c35c0cb4e26c6aff4a913777fd21069fd3c':
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.
Amith Yamasani [Tue, 6 Dec 2011 23:37:31 +0000 (15:37 -0800)]
am
f3364080: Merge "New and improved silent mode on lockscreen." into ics-mr1
* commit '
f336408000c4be36045401fb4df89528249e7383':
New and improved silent mode on lockscreen.
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
Fabrice Di Meglio [Tue, 6 Dec 2011 22:27:12 +0000 (14:27 -0800)]
Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)
- disable GSUB / GPOS table loading
Change-Id: I2ae058c9d926242586f90dc2a98302ff886f1fe1
Andreas Huber [Tue, 6 Dec 2011 23:03:10 +0000 (15:03 -0800)]
Merge commit '
babb7200' into manualmerge
Amith Yamasani [Tue, 6 Dec 2011 03:58:48 +0000 (19:58 -0800)]
New and improved silent mode on lockscreen.
3-state item to toggle between Silent/Vibrate/Ringer in long-press power menu.
No volume dialog on lockscreen, unless Power menu is up.
Set VIBRATE_IN_SILENT=1 when upgrading device.
Change-Id: I097d216f96c4abdbd83420e0c477106951b3607d
Andreas Huber [Tue, 6 Dec 2011 18:59:48 +0000 (10:59 -0800)]
DO NOT MERGE: Remove the AVI extractor.
Change-Id: Ib9cb4a48bd817da703ef53eb14932616d2973ee0
Irfan Sheriff [Tue, 6 Dec 2011 19:20:30 +0000 (11:20 -0800)]
Disable wifiwatchdog for now
Change-Id: I2ac4fa706f3d0a415cb8e86002173b776aba4e02
Adam Powell [Tue, 6 Dec 2011 22:00:18 +0000 (14:00 -0800)]
am
720efc43: Merge "Lower touch slop in ViewConfiguration." into ics-mr1
* commit '
720efc43d89ce9fd50b66f22cdb1bb4363cfb291':
Lower touch slop in ViewConfiguration.
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:55:39 +0000 (12:55 -0800)]
am
6b8b5a0a: Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1
* commit '
6b8b5a0a4183c0f8d1d5ceacc9e50194589a77d3':
DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames
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:46:46 +0000 (12:46 -0800)]
am
05d63069: Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1
* commit '
05d630691127c022befd071b2bede87c707112a9':
DO NOT MERGE: Remove the AVI extractor.
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
Adam Powell [Tue, 6 Dec 2011 03:26:54 +0000 (19:26 -0800)]
Lower touch slop in ViewConfiguration.
Our typical touchscreens are now good enough that we don't need the
touch slop to be as large as it once was. Lower it to increase
responsiveness while scrolling.
Move the touch slop constant to the config resource
config_viewConfigurationTouchSlop so that it may be more easily
tweaked in device-specific overlays.
Change-Id: I7c11d8affcb98e91654203beb13a26cfeec18f7c
Hong Teng [Tue, 6 Dec 2011 19:51:47 +0000 (11:51 -0800)]
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.
Change-Id: I77862e55e8ee990f72f617a804f26fd724914b5b
Irfan Sheriff [Tue, 6 Dec 2011 19:37:40 +0000 (11:37 -0800)]
am
40cb30c2: am
7b62313e: Disable wifiwatchdog for now
* commit '
40cb30c2df2176c03f24cbdc194e3af5a4f64758':
Disable wifiwatchdog for now
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
Andreas Huber [Tue, 6 Dec 2011 18:01:27 +0000 (10:01 -0800)]
DO NOT MERGE: Remove the AVI extractor.
Change-Id: Ifce6c0d3d87aad2f5cc7f40ad6304936cbfa795e
Gilles Debunne [Tue, 6 Dec 2011 19:22:19 +0000 (11:22 -0800)]
am
98a85c2d: Merge "Invalidated bounds tightened in TextView" into ics-mr1
* commit '
98a85c2de6b3f27ba1ccb2cfd44a775b4f490f72':
Invalidated bounds tightened in TextView
Irfan Sheriff [Tue, 6 Dec 2011 19:20:30 +0000 (11:20 -0800)]
Disable wifiwatchdog for now
Change-Id: I2ac4fa706f3d0a415cb8e86002173b776aba4e02
Andreas Huber [Tue, 6 Dec 2011 18:59:48 +0000 (10:59 -0800)]
DO NOT MERGE: Remove the AVI extractor.
Change-Id: Ib9cb4a48bd817da703ef53eb14932616d2973ee0
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:36:30 +0000 (10:36 -0800)]
am
58ad16cf: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
58ad16cfeaac1c2124d0f9e9d2b5c493e163128c':
Import revised translations. DO NOT MERGE
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:29:13 +0000 (10:29 -0800)]
am
ea25ea7e: Merge "Adding a system preference whether to speak passwords in accessibility mode." into ics-mr1
* commit '
ea25ea7ef30be14dd940f1667e0308bfff5b4d85':
Adding a system preference whether to speak passwords in accessibility mode.
Eric Fischer [Tue, 6 Dec 2011 18:27:06 +0000 (10:27 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I1d49a1533bd0481543280a379a9f93bd7027e54a
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:52:20 +0000 (22:52 -0800)]
am
4079702a: Merge "Fix memory corruption issues in TextLayoutCache. (DO NOT MERGE)" into ics-mr1
* commit '
4079702ac27b51282a25de5f7c20f6fba6b71995':
Fix memory corruption issues in TextLayoutCache. (DO NOT MERGE)
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:14:37 +0000 (22:14 -0800)]
am
17f9fe13: Merge "Fix
5705837: Dismiss keyguard when launching Settings from Statusbar" into ics-mr1
* commit '
17f9fe13c7c78eaab521f6f85b48b0e8f5adddbc':
Fix
5705837: Dismiss keyguard when launching Settings from Statusbar
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:24:53 +0000 (21:24 -0800)]
am
3e7b412d: Merge "Fix statusbar crash on devices with no Bluetooth" into ics-mr1
* commit '
3e7b412d7d6332830ceaf123edb5e211757c69ce':
Fix statusbar crash on devices with no Bluetooth
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
Jeff Brown [Tue, 6 Dec 2011 04:37:44 +0000 (20:37 -0800)]
Fix memory corruption issues in TextLayoutCache. (DO NOT MERGE)
Ensure log_clusters array is big enough.
Bug:
5714171
Explicitly handle the cases where the entire string or a single
run might have a length of 0.
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.
Bug:
5705479
Change-Id: If28a9866221081f69973c1d12d7fe0cf8db2edd0
Matthew Xie [Tue, 6 Dec 2011 03:58:12 +0000 (19:58 -0800)]
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
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:18:34 +0000 (19:18 -0800)]
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
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:09:17 +0000 (19:09 -0800)]
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
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:04:13 +0000 (19:04 -0800)]
am
f66664a5: Merge "Fix sticky menu icon on tablet status bar." into ics-mr1
* commit '
f66664a50e914e1cc5d66046cfc4c5b195a09eab':
Fix sticky menu icon on tablet status bar.
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
Dianne Hackborn [Tue, 6 Dec 2011 02:05:31 +0000 (18:05 -0800)]
Fix issue #
5713576: Home redraws after returning from app on Nexus S 4G
Turn of destroying of activities during memory trimming.
Change-Id: Ibea415c13fca4f67f56adefe81a1495f5f9ad273
Dianne Hackborn [Tue, 6 Dec 2011 02:15:17 +0000 (18:15 -0800)]
Truthiness is good.
Change-Id: Iedd4d4027576001fc5e829bb0a1023dd2aefce99
Dianne Hackborn [Tue, 6 Dec 2011 01:42:41 +0000 (17:42 -0800)]
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
Adam Powell [Tue, 6 Dec 2011 01:40:18 +0000 (17:40 -0800)]
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)
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
Matthew Xie [Tue, 6 Dec 2011 01:36:01 +0000 (17:36 -0800)]
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
Eric Laurent [Tue, 6 Dec 2011 01:22:58 +0000 (17:22 -0800)]
am
7b6aff23: Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1
* commit '
7b6aff23735a9ef8759c5ecb4427784413e9b85b':
audioflinger: fix audio skipping over A2DP
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:47:06 +0000 (16:47 -0800)]
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()
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:13:49 +0000 (16:13 -0800)]
am
3124e6f9: Merge "Remove debug log messages" into ics-mr1
* commit '
3124e6f9e96b730cdfbbf068f15c41b6d5c8a819':
Remove debug log messages
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:55:27 +0000 (15:55 -0800)]
am
e63d67ef: Merge "Add extra 2 minute for wifi to shutdown" into ics-mr1
* commit '
e63d67eff794ba2e4e5d2aa9e8854b37329f4429':
Add extra 2 minute for wifi to shutdown
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
Fred Quintana [Mon, 5 Dec 2011 23:04:16 +0000 (15:04 -0800)]
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
Adam Powell [Mon, 5 Dec 2011 23:38:51 +0000 (15:38 -0800)]
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
Svetoslav Ganov [Mon, 5 Dec 2011 23:04:31 +0000 (15:04 -0800)]
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.
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
Michael Kolb [Mon, 5 Dec 2011 22:55:02 +0000 (14:55 -0800)]
Remove debug log messages
Bug:
5713163
Change-Id: Id8d9845f6ecb7dd90ae4cf42bc82d39a148a5700
Svetoslav Ganov [Mon, 5 Dec 2011 19:42:07 +0000 (11:42 -0800)]
Adding a system preference whether to speak passwords in accessibility mode.
By default we do not speak passwords if the user has no headset. However,
many users find this too restrictive and would like a way to enable
password announcement. While we cannot speak the passwords all the time
,to avoid leaking them, we expose a preference so each user can choose
the option that best works for him/her.
bug:
5712607
Change-Id: I6eb0c40834abe5297f7dc74be02d180a5bef0174
James Dong [Mon, 5 Dec 2011 20:41:06 +0000 (12:41 -0800)]
DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames
The current logic does not check the I-frame at zeroeth position and therefore
for the files with only 1 I-Frame at zeroeth postion does not play.
Originally authored by Braganza Sam Robertsh <sam.braganza@samsung.com>
Do not merge to master branch since we made some improvement to SampleTable.cpp in the master branch.
Change-Id: I068184dec71986f14a586f769c2af1f52b4bcf94
related-to-bug:
5711942
Irfan Sheriff [Mon, 5 Dec 2011 22:22:03 +0000 (14:22 -0800)]
am
6b66e9e4: Switch to notifications for walled garden
* commit '
6b66e9e4c95b1c866ea63a0122fc199994fd7053':
Switch to notifications for walled garden
Svetoslav Ganov [Mon, 5 Dec 2011 22:16:26 +0000 (14:16 -0800)]
TalkBack does not announce properly the buttons of the PIN lock.
The KeyBoardView shown by the lock screen is not marked as clickable even
though it handles clicks. TalkBack uses the clickability as a clue of what
to speak.
bug:
5713102
Change-Id: I0733e30619e6045ce3f78e1499db65f4dc5bc388
Irfan Sheriff [Mon, 24 Oct 2011 23:55:50 +0000 (16:55 -0700)]
Switch to notifications for walled garden
Also, switches the URL for browser to the actual URL used for checking
walled garden
Bug:
5398921
Change-Id: Ie4d4b1d47f4151d0f85975b10190bdcf5f2e7a57
Peter Ng [Mon, 5 Dec 2011 20:36:24 +0000 (12:36 -0800)]
am
74b496dd: Merge "Numberpicker section divider is now 2dp thick" into ics-mr1
* commit '
74b496dd8aab7e29bcba0c6502f773555c4ce29f':
Numberpicker section divider is now 2dp thick
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:28:06 +0000 (12:28 -0800)]
am
845b3efc: Merge "Add missing locale date format files." into ics-mr1
* commit '
845b3efc9935e66b718d8e9a56435bf039f97633':
Add missing locale date format files.
Eric Fischer [Mon, 5 Dec 2011 20:25:58 +0000 (12:25 -0800)]
Merge "Add missing locale date format files." into ics-mr1
Xia Wang [Sat, 3 Dec 2011 01:49:36 +0000 (17:49 -0800)]
Add extra 2 minute for wifi to shutdown
Change-Id: I3cf2fbf5de8b96b75d5e460e4ad822a1947ff6e7
Eric Fischer [Mon, 5 Dec 2011 20:20:01 +0000 (12:20 -0800)]
Add missing locale date format files.
Change-Id: I4533c8aff25ee9f6a37a18005ea1341c99c4e696
Andreas Huber [Mon, 5 Dec 2011 20:03:41 +0000 (12:03 -0800)]
am
f2e12498: Merge "Properly identify how much metadata we need to cache in order to instantiate" into ics-mr1
* commit '
f2e1249846a17c69d728189a8dc67f37261f0a59':
Properly identify how much metadata we need to cache in order to instantiate
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
Andreas Huber [Mon, 5 Dec 2011 19:34:43 +0000 (11:34 -0800)]
Properly identify how much metadata we need to cache in order to instantiate
the extractor without blocking (and therefore be able to abort).
Change-Id: Id2acdde897e02baaeabadae70b7c95b66c9041b3
related-to-bug:
5666532
Peter Ng [Mon, 5 Dec 2011 19:16:27 +0000 (11:16 -0800)]
Numberpicker section divider is now 2dp thick
Change-Id: I614c7316e43c23650166971662ed7dfd847ddaa8
Jesse Hall [Mon, 5 Dec 2011 19:10:32 +0000 (11:10 -0800)]
Fix statusbar crash on devices with no Bluetooth
Change-Id: Ib2290f9cde54d0d52c2692b11b0232848bbbc8b0
Dianne Hackborn [Mon, 5 Dec 2011 18:42:51 +0000 (10:42 -0800)]
am
003c15d7: Merge "Fix issue #
5614559: Registering surface error in..." into ics-mr1
* commit '
003c15d72ccd3856d5abfe6d66a2a40d0eca85bc':
Fix issue #
5614559: Registering surface error in...
Dianne Hackborn [Mon, 5 Dec 2011 18:40:59 +0000 (10:40 -0800)]
Merge "Fix issue #
5614559: Registering surface error in..." into ics-mr1
Eric Laurent [Mon, 5 Dec 2011 17:47:19 +0000 (09:47 -0800)]
audioflinger: fix audio skipping over A2DP
The maximum sleep time allowed in the mixer thread when audio tracks
are enabled but not ready for mixing is derived from the latency
reported by the output stream.
This does not work for A2DP where the latency also reflects encoding, decoding
and transfer time.
Modified activeSleepTimeUs() to take A2DP case into account.
Issue
5682206.
Change-Id: I3784ac01fb6f836b5a6ce6f764fb15347586de35