Merge commit '86aece8b4ad6d55cc9a3c185c3730d7387a46661' into eclair-plus-aosp
* commit '86aece8b4ad6d55cc9a3c185c3730d7387a46661':
Handle bad lines in /proc/wakelocks : Fix for 2124260
This change makes sure that ACTV will not take action when an event is
received in a popup that just got dismissed.
This change also makes public two XML attributes of ACTV whose corresponding
Java APIs are public.
This change also fixes a couple of typos.
Change-Id: I78f113bc522d199ff3db44fc4cc3a1882afe822e
Merge commit '1537a25520405f384b072c58fee935a29c4e14ea' into eclair-plus-aosp
* commit '1537a25520405f384b072c58fee935a29c4e14ea':
Remove unused api in QuickContact.java and fix the build.
Merge commit '85d86af982026145aa69a4ca280d394b9ea90372' into eclair-plus-aosp
* commit '85d86af982026145aa69a4ca280d394b9ea90372':
Fix vCard composer in three points.
Merge commit '609c2c08d7d059681434ea322b551264abab8a71' into eclair-plus-aosp
* commit '609c2c08d7d059681434ea322b551264abab8a71':
- make SyncManager get the accounts list during the constructor,
* changes:
- make SyncManager get the accounts list during the constructor, which will allow syncs to be scheduled during bootup. The providers need this so that they can potentially schedule syncs while they are starting up. - make the SyncManager message handler wait until boot has completed to start dispatching messages
Use the return value from the native parser to skip over bad lines. When
the wakelocks overflow, there could be empty or badly formatted lines.
Skip over them.
which will allow syncs to be scheduled during bootup. The
providers need this so that they can potentially schedule
syncs while they are starting up.
- make the SyncManager message handler wait until boot
has completed to start dispatching messages
Merge commit '017c5de1cf1228664da84b31012a386c2eac2232' into eclair-plus-aosp
* commit '017c5de1cf1228664da84b31012a386c2eac2232':
Query from Bluez if name is not present in cache.
- Make it allow composer users to emit Quoted-Printabled primary ("N", "FN", etc.) properties.
- Make it strictly check whether it is necessary for the composer to emit CHARSET infomation.
-- Added the logic "not vCard 3.0, or, CHARSET is not UTF-8".
- Clean up the code (again...)
Merge commit '8b781403f183fa3616accd1e243d02168a9b9b1d' into eclair-plus-aosp
* commit '8b781403f183fa3616accd1e243d02168a9b9b1d':
Reduce the log spew from AudioFlinger due to a certain device that can't meet latency timing. Bug 2142215.
Merge commit '1935a3417e986d38b9a0d981c3dbd06acf75a9fc' into eclair-plus-aosp
* commit '1935a3417e986d38b9a0d981c3dbd06acf75a9fc':
Change FasttrackBadgeWidget->QuickContactBadge and make public.
Merge commit 'a3431e4c7d6307b845d7008955d99425d842ff72' into eclair-plus-aosp
* commit 'a3431e4c7d6307b845d7008955d99425d842ff72':
Add a delay to wifi driver stop on screen off.
Merge commit '6e58cf21088c2e6b0ef52572bfd544347e02fc17' into eclair-plus-aosp
* commit '6e58cf21088c2e6b0ef52572bfd544347e02fc17':
Invoke the OnErrorListener callback when MediaPlayer.setDataSource() throws.
We already had a delay if we were associated, but we have some race conditions
we think will be masked if we delay the driver stop for the other cases
too. Don't wait as long (2 min instead of 15).
bug: 2147260
When webkit modifies a text field programmatically, it may change
the selection. This competes with the UI thread attempting to
set the selection in response to the IME next button and changes
made by the trackball.
One recent fix (https://android-git.corp.google.com/g/#change,26904)
sets the selection from the UI side after the IME generated click.
Unfortunately, this can be generated under other circumstances,
so this change qualifies this with mOkayForFocusNotToMatch, which
is only set after the IME next button is pressed.
The other change qualfies onTextChanged calls so that if it was
triggered by setTextAndKeepSelection, the webkit-side selection
is unchanged.
fixes http://b/issue?id=2096746
Merge commit '9fcd581a022abec565e3bf65c3ed4aaecf7d1555' into eclair-plus-aosp
* commit '9fcd581a022abec565e3bf65c3ed4aaecf7d1555':
if we have a single value for roundrect radius, manually clamp it before drawing.
Merge commit 'ccf6947eaaa5f7af57290dcdcdfbabe0a8985015' into eclair-plus-aosp
* commit 'ccf6947eaaa5f7af57290dcdcdfbabe0a8985015':
Re-instate the link coloring on startup, but going via the browser
