Mike Lockwood
43adbae803
Merge "NetworkTimeUpdateService: Schedule NTP on ethernet connect as well as wifi" into ics-aah
2011-11-09 10:55:26 -08:00
Mike Lockwood
0342a420a4
NetworkTimeUpdateService: Schedule NTP on ethernet connect as well as wifi
...
Change-Id: I936fd9a8119ee361ec0afde60f7931c58ffdd524
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-11-09 10:49:29 -08:00
Andreas Huber
3f99d95312
There's no point in trying to continue to decode after an error was signalled.
...
Change-Id: I2a2410cac9444eadd85be5d104799703171f1a24
related-to-bug: 5588658
2011-11-09 10:26:06 -08:00
Jason Simmons
f981686779
resolved conflicts for merge of 3af8b88d to ics-aah
...
Change-Id: I2b68cd7c904e68a16565b7274560e7105c643c87
2011-11-09 10:08:21 -08:00
Andreas Huber
977702929b
Don't believe the PV decoder's lies...
...
Change-Id: I97391235255afb8a4890a4ff52d4e8e9ca954f27
2011-11-09 10:03:07 -08:00
John Reck
36a7f2a9ad
Merge "Fix determining find on page overlap" into ics-mr1
2011-11-09 09:28:11 -08:00
The Android Open Source Project
eae6c9972d
Reconcile with ics-mr0-release
...
Change-Id: I20113f16c260f8f796a0d370ea105ee17bdaea63
2011-11-09 09:00:40 -08:00
Jean-Michel Trivi
20cf0916cc
Merge "Bug 5585323 New system permission for media decode" into ics-mr1
2011-11-09 08:57:43 -08:00
David Brown
b6b44cef94
am 59882fb8: Merge "Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()" into ics-mr0
...
* commit '59882fb8e0ba7c47b780d62c9a9c46b63d779677':
Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()
2011-11-09 16:41:20 +00:00
Glenn Kasten
f2c2b1c484
am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0
...
* commit '19998120f53caceb620f138c6eea182f1e693660':
Bug 5478024 drop after decode if can't drop before
2011-11-09 16:41:19 +00:00
Jake Hamby
9c5c97f618
am fee5f29b: Merge "Fix exception when sending multi-page SMS with Turkish characters." into ics-mr0
...
* commit 'fee5f29b22f99bd2891fb2af54669f20832fb851':
Fix exception when sending multi-page SMS with Turkish characters.
2011-11-09 16:40:59 +00:00
Eric Laurent
2b7f91b932
Merge "Fix regression for SoundPool playback" into ics-mr1
2011-11-09 08:27:20 -08:00
Daniel Sandler
e989b32b3a
Use platform assets for brightness scrubber.
...
Bug: 5544665
Change-Id: I063f930b15668c06a30b857e477f3227d1fe526f
2011-11-09 10:52:34 -05:00
Brian Colonna
09a56563ce
am 04217efb: Merge "Fix 5514230: preventing null window token from occurring" into ics-mr0
...
* commit '04217efb8eaebdbd846671a2f743fa3e960b5dde':
Fix 5514230: preventing null window token from occurring
2011-11-09 15:35:12 +00:00
Michael Kolb
d8883f5129
am a4293ba1: Merge "Remove flicker from WebTextView" into ics-mr1
...
* commit 'a4293ba1a0f1129d5879ae9eda45292ff357e20c':
Remove flicker from WebTextView
2011-11-09 14:37:36 +00:00
Jamie Gennis
13aeb48dcf
am d211b488: Merge "SurfaceTexture: unhide setDefaultBufferSize" into ics-mr1
...
* commit 'd211b4882a662409b85a1f90c71e28faa9c54464':
SurfaceTexture: unhide setDefaultBufferSize
2011-11-09 14:37:29 +00:00
Jamie Gennis
08aa0b5742
am 911263dc: Merge changes I18e5e789,I5cbaae2d into ics-mr1
...
* commit '911263dc5df48b89e8f9010fb74dfe2649bdc442':
EGL: implement loading and saving the cache
EGL: use an in-memory the blob cache
2011-11-09 14:37:27 +00:00
Mathias Agopian
3c8f426802
am 95482b61: Merge "Fix an issue where we could wait for a non-existing transaction" into ics-mr1
...
* commit '95482b61c348fc54bf44a96a8b73011c90b40520':
Fix an issue where we could wait for a non-existing transaction
2011-11-09 14:37:24 +00:00
Irfan Sheriff
70b1999ad5
am 59c73b92: Merge "Convert soft ap config store to state machine" into ics-mr1
...
* commit '59c73b92a9ef8df5d4873bc36f05b776c3a476bc':
Convert soft ap config store to state machine
2011-11-09 14:37:22 +00:00
Dave Santoro
b7a262cdc1
am b78ae752: Merge "Unhide social stream APIs for Contacts." into ics-mr1
...
* commit 'b78ae7524eecbca01a53994d6872202633c8341b':
Unhide social stream APIs for Contacts.
2011-11-09 14:37:19 +00:00
Adam Powell
2690e48d1f
am 650a3e88: Merge "Fix the action bar menu layout to use the correct divider drawable." into ics-mr1
...
* commit '650a3e8894c6d26b258d26bdec856fde7aba43d6':
Fix the action bar menu layout to use the correct divider drawable.
2011-11-09 14:37:17 +00:00
Wei Huang
bb28878666
am ea50748b: Merge "Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA." into ics-mr1
...
* commit 'ea50748b546e7dc21dc06195af5f0a8f2b812417':
Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA.
2011-11-09 14:37:14 +00:00
Matthew Xie
afb3fa6c96
am 48542eb3: Merge "Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1
...
* commit '48542eb39e55f2d0e2a79d43e696ffb2acb67b5c':
Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp
2011-11-09 14:37:11 +00:00
Dianne Hackborn
ad34155e35
am 665e105f: Merge "Cleanup remote execution of perf tests." into ics-mr1
...
* commit '665e105f145fcb27a54d53c6c9382bebf50a56d7':
Cleanup remote execution of perf tests.
2011-11-09 14:37:10 +00:00
The Android Open Source Project
9594b4a558
am 6dee1a9d: Reconcile with ics-mr0-release
...
* commit '6dee1a9d046458134fb019669b5ffe7911dcdb29':
2011-11-09 14:37:00 +00:00
Adam Cohen
87ce25a772
am 75b20380: Merge "Making default widget padding public API" into ics-mr1
...
* commit '75b2038004f3338c68c9a0e89b29a31e10b237da':
Making default widget padding public API
2011-11-09 14:36:57 +00:00
The Android Automerger
7040a65cbc
merge in ics-mr0-release history after reset to ics-mr0
2011-11-09 06:28:43 -08:00
Gilles Debunne
61ddbbae71
Visual glitches when starting extracted text
...
Partially addresses Bug 5547923
In landscape, tapping on the text
1. starts extracted text mode
2. displays the cursor handle or the selection popup window.
As a result, some ghost effects and race conditions create an
unpleasing visual experience.
Fixed this by not doing 2. in case extracted mode will start.
The drawback of this quicl fix is that the user will have to
tap again to get the handle/suggestion. That can be fixed later
if needed.
Change-Id: I10e1d8399bb35e5b2cd5cba1295f7d29d051cae0
2011-11-09 09:48:43 +01:00
Gilles Debunne
76bb11ca64
Merge "Bug 5575396: close spell session on language change" into ics-mr1
2011-11-09 00:26:46 -08:00
Jeff Sharkey
630a13bdd8
Merge "Bootstrap stats before registering listeners." into ics-mr1
2011-11-08 23:43:58 -08:00
Jeff Sharkey
4c48d2ff69
Merge "Make operation counts monotonically increase." into ics-mr1
2011-11-08 23:43:38 -08:00
Jeff Sharkey
2048789c64
Merge "Dispatch alerts through background thread." into ics-mr1
2011-11-08 23:43:23 -08:00
Jeff Sharkey
f3882914e6
Merge "Make policy data enabled flag static." into ics-mr1
2011-11-08 23:43:12 -08:00
Jeff Brown
0bde66a837
Throw TransactionTooLargeException when Binder transaction fails.
...
Bug: 5578022
Previously, Binder transactions failed silently, which caused
problems because apps would carry on assuming that the operation
had succeeded. Often, the apps would crash soon due to a violated
invariant, but sometimes they managed to do some damage first...
Change-Id: Ia9cc98b3b761a8160e7c4e87507860b5912c0451
2011-11-08 20:42:11 -08:00
Daniel Sandler
da738d638c
Merge "Add day of week." into ics-mr1
2011-11-08 20:35:45 -08:00
Eric Laurent
8a04fe032b
Fix regression for SoundPool playback
...
Commit 19ddf0eb introduced a problem with applications (like SoundPool)
relying on an underrun condition to detect end of playback instead of
stopping the track when all data is written.
AudioFlinger would keep waiting for new data in case of partial buffer
filling and never reach the underrun condition.
Added a mechanism to wait no more than once if not enough frames are present
in the track buffer.
Issue 5585490.
Change-Id: I131e605ff6070831a01ddf734e68459e3bf2354b
2011-11-08 18:42:37 -08:00
David Brown
59882fb8e0
Merge "Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()" into ics-mr0
2011-11-08 18:25:30 -08:00
Jeff Sharkey
3359aca765
Bootstrap stats before registering listeners.
...
Also move ISE to handled NonMonotonicException.
Bug: 5570872
Change-Id: I793f349287ef5589185f117dfbec6f1fad73a661
2011-11-08 18:24:12 -08:00
Mathias Agopian
e4a1bafba3
Merge "decrease the light-sensor rate to 1Hz (from ~15Hz) for ALS purposes." into ics-mr1
2011-11-08 18:01:21 -08:00
Jamie Gennis
2ea0cbb3d1
EGL: add deferred saving of the cache
...
This change causes any insertions into the EGL cache to trigger an
attempt to save the cache contents to disk. The save operation is
deferred to allow multiple cache insertions to be batched up.
Change-Id: I6cfec9c0dbbef94d3f8880860e2a365dccc296c7
2011-11-08 17:59:36 -08:00
Dianne Hackborn
cd489c4ce5
Merge "Don't crash if there is no connectivity service." into ics-mr1
2011-11-08 17:58:26 -08:00
Jeff Sharkey
7e25b0ea88
Dispatch alerts through background thread.
...
Bug: 5557659
Change-Id: Icc3ad476a98ec3430b33f915723ffcc36ccbfae7
2011-11-08 17:41:26 -08:00
Joe Onorato
1e2c0d231e
Merge "For events, require that the parameters be marked in." into ics-aah
2011-11-08 17:36:35 -08:00
Eric Fischer
7a6ce3465c
Import revised translations. DO NOT MERGE
...
Change-Id: I46ccb7f02a64e3e6c7597b0dc295450b4f5625e6
2011-11-08 17:36:34 -08:00
Jeff Sharkey
4abb1b8ef6
Make operation counts monotonically increase.
...
Bug: 5585704
Change-Id: I5247a68acdb209a4ef0f5aac18944595c295e6ca
2011-11-08 17:35:28 -08:00
Joe Onorato
2037c2585c
For events, require that the parameters be marked in.
...
(because they won't work otherwise)
Change-Id: I77f370ca1bc381ea07fc2854d2a90d8138ca1796
2011-11-08 17:35:09 -08:00
Dianne Hackborn
d4d32c594f
Don't crash if there is no connectivity service.
...
Change-Id: I5f991896125fda22ff99b98a6aca244adbb17449
2011-11-08 17:33:59 -08:00
Svetoslav Ganov
1bef480b22
Merge "NumberPicker incorectly enforcing minimal width and height." into ics-mr1
2011-11-08 17:33:49 -08:00
Glenn Kasten
19998120f5
Merge "Bug 5478024 drop after decode if can't drop before" into ics-mr0
2011-11-08 17:31:32 -08:00
Peter Ng
f804e06078
Making quicksettings opaque again
...
Bug:5522957
Change-Id: I27e9e78f4e706333f9a363b3d97ae6f602321173
2011-11-08 17:28:56 -08:00