Merge commit '6c317acc9f1d43cd5d75e3b766c5431cf2a354d8'
* commit '6c317acc9f1d43cd5d75e3b766c5431cf2a354d8':
Dormant ICON was not being displayed, fixes bug 2039239.
This API is becoming seriously abused, so now it is deprecated and has
become a no-op.
As an alternative, there is now a new API that allows you to make a service
be in the foreground but requires providing a persistent notification to
go along with this state, allowing the user to know about and control it.
Merge commit '9cefd00f83df16f1763eaea08b96569db826e1f2'
* commit '9cefd00f83df16f1763eaea08b96569db826e1f2':
Simplified algorithm used to generate the preloaded-classes list. Generated a new preloaded-classes file.
Merge commit '79dbf7c8fc910957c9687b863eae97a768d6be60' into eclair
* commit '79dbf7c8fc910957c9687b863eae97a768d6be60':
Import revised translations. DO NOT MERGE
Merge commit '30c0b83490d856c1cd82441c8e2d800a88927237'
* commit '30c0b83490d856c1cd82441c8e2d800a88927237':
Remove dead locks in system process when installing packages
Merge commit 'd9d2576017fadcf47589b54e8ee198f48cc19352' into eclair
* commit 'd9d2576017fadcf47589b54e8ee198f48cc19352':
Remove dead locks in system process when installing packages
Merge commit 'b22293590cb10b1d8722dbf9c226cb58f240d7d5'
* commit 'b22293590cb10b1d8722dbf9c226cb58f240d7d5':
Get At command count from Bluetooth headset.
Merge commit '97e470048a9ce703c7192f08a86b0ce0eed00eaa'
* commit '97e470048a9ce703c7192f08a86b0ce0eed00eaa':
Include the list of registered providers the package manager dumpsys output.
Merge commit '4a6679b97e0285c5b65ec5c0d9080ff90d3e9e81'
* commit '4a6679b97e0285c5b65ec5c0d9080ff90d3e9e81':
make syncadapter set whether the account is syncable
Merge commit 'edc5ff862877d679578cbe9ecbbc806782620968'
* commit 'edc5ff862877d679578cbe9ecbbc806782620968':
Fix issue #2056585: applications can put phone in inconsistent state wrt airplane mode
Merge commit '93df578638418ef2f05efdf58331d847f41b17b5'
* commit '93df578638418ef2f05efdf58331d847f41b17b5':
Correct comments for startSearch in Activity and SearchManager to explain
Merge commit '5d8cbf8da3f44709bd9e64b10c037cdb543ffb17'
* commit '5d8cbf8da3f44709bd9e64b10c037cdb543ffb17':
Unhide the broadcast intent that signals completion of the TTS language
Based on the VZW requirement, phone should be still in ECM mode in 2nd emergency call.
but in the current phone call, if a 2nd emergency call is originated, ECM mode will exit.
For fixing this problem, the coding design is as below:
1. In framework, canceling the first ECM timer immediately upon the origination of the
2nd E911 call, and restarting a new timer when the 2nd E911 ends.
2. Framework needs to syncronize the timer with phone app by sending notification to phone app to
inform timer is canceled or re-started, since phone app needs to show how much ECM time left
on the status bar.
3. In phone app's emergency callback mode service, the timer in this service will be canceled
when it receives the timer cancel notification from framework; the timer will be restarted
once it receives timer restart notification from framework.
