Merge commit '2d295a9601315a2610a2cb759ed9a4f787e7d4b5' into eclair-mr2-plus-aosp
* commit '2d295a9601315a2610a2cb759ed9a4f787e7d4b5':
Some decoders will return an error on OMX_EmptyThisBuffer to indicate that they don't support the media format, deal with this.
Merge commit 'c33623a02483e0fa271f4da6c1d38ba9becfe0c2' into eclair-mr2-plus-aosp
* commit 'c33623a02483e0fa271f4da6c1d38ba9becfe0c2':
Make FWK start a wifi scan if supplicant forgets.
Merge commit '23bccd6c25f581860487835bf7b5442589897352' into eclair-mr2-plus-aosp
* commit '23bccd6c25f581860487835bf7b5442589897352':
Insert a small delay after submitting to surface flinger and before returning the buffer to the decoder.
Merge commit '9d5b58991ef90e91b3c942c80ae3502ed62d10aa' into eclair-plus-aosp
* commit '9d5b58991ef90e91b3c942c80ae3502ed62d10aa':
Set the Bond State to NONE when we receive a Agent Cancel.
Waits 15sec after getting a DISCONNECTED or INACTIVE state. Also tracks
the number of supplicant state transitions. After the period is up
if we haven't received any more supplicant state transitions, it requests a scan.
bug: 2168081
Merge commit '33e21fcc99dd91061ea245984c4e9a1544cb943f' into eclair-plus-aosp
* commit '33e21fcc99dd91061ea245984c4e9a1544cb943f':
Control H icon display in Status bar.
Merge commit '3b36ed09293965e7e5dc20dfa514422388e796d6' into eclair-plus-aosp
* commit '3b36ed09293965e7e5dc20dfa514422388e796d6':
Fixes#2175599. Prevents an NPE when AttachInfo is null.
Merge commit 'cd74c0d56c0756ceb5cfa5f06d76e17aa2ed6fb9' into eclair-mr2-plus-aosp
* commit 'cd74c0d56c0756ceb5cfa5f06d76e17aa2ed6fb9':
The vendor is about to check in a fix for this issue, the workaround is no longer needed
Since we cannot tell how long it'll take until surface flinger
has displayed the data onscreen, we'll just have to guess...
We must not return the buffer to the decoder before it's been displayed.
In LocationManagerService if a LocationListener is removed while it has
a pending broadcast the wake lock held while pending broadcasts are
outstanding do not get cleared properly.
There are 2 cases of this race that are fixed:
1. locationCallbackFinished was changed to check the mReceivers HashMap
directly instead of calling getReceiver. getReceiver would add the
ILocationListener as a new Receiver if it did not exist which caused
a receiver that was removed when it still had a broadcast pending to
be added back in a bad state when the pending broadcast completed.
2. removeUpdatesLocked was changed to decrement the pending broadcasts
when a Receiver is removed that has pending broadcasts.
Fixes bug b/2163871
Change-Id: I50a321c9b3359bf69845236dc4a4b9e38e847335
Signed-off-by: Mike Lockwood <lockwood@android.com>
Sometimes during OPP, we can get stuck in Pairing state when the remote
end, cancels the Pairing process - we will just get onAgentCancel
and thus not set the Pairing state properly.
DrNo: Eastham
Bug:2174874
Merge commit 'f81ecc1fb7cad523b62c7f2662f4aab3ea0dee54' into eclair-mr2
* commit 'f81ecc1fb7cad523b62c7f2662f4aab3ea0dee54':
Only dismiss search dialog after launching intent.
Merge commit 'f81ecc1fb7cad523b62c7f2662f4aab3ea0dee54' into eclair-plus-aosp
* commit 'f81ecc1fb7cad523b62c7f2662f4aab3ea0dee54':
Only dismiss search dialog after launching intent.
Merge commit '8bd04b2000f418c8c6f4f628abc215bb5a688244' into eclair-plus-aosp
* commit '8bd04b2000f418c8c6f4f628abc215bb5a688244':
fix an NPE on a race condition that occurs when unbinding from an authenticator at the samer time that its process dies: bug 2171204
Merge commit '8bd04b2000f418c8c6f4f628abc215bb5a688244' into eclair-mr2
* commit '8bd04b2000f418c8c6f4f628abc215bb5a688244':
fix an NPE on a race condition that occurs when unbinding from an authenticator at the samer time that its process dies: bug 2171204
Merge commit 'b134b2038ecabcbec3f9b657834d45de27707068' into eclair-plus-aosp
* commit 'b134b2038ecabcbec3f9b657834d45de27707068':
More fix#2163209: alarm clock rings but is hidden behind lock screen
Merge commit 'b134b2038ecabcbec3f9b657834d45de27707068' into eclair-mr2
* commit 'b134b2038ecabcbec3f9b657834d45de27707068':
More fix#2163209: alarm clock rings but is hidden behind lock screen
