Merge commit '106278c40271fec941a86e5eac66ae5c8477a56a'
* commit '106278c40271fec941a86e5eac66ae5c8477a56a':
do not merge: cherrypicked 3710f390968e683a0ad3adf0b517dfcade3564ce from master branch
Merge commit '403d7ac7d14e87ecc7df25a1fbb79649ec5ada90'
* commit '403d7ac7d14e87ecc7df25a1fbb79649ec5ada90':
Bring back SHOULD_SYNC flag so sync groups can be edited.
Issues to be addressed:
The method setPowerStateToDesired() in CdmaServiceStateTracker class sends
a msg to CdmaDataConnectionTracker class to deactive data call, and then starts
a loop which calls SystemClock.sleep() to wait for several seconds.The purpose
of this is to wait for data-disconnection before sending RADIO_POWER off request.
However, the CdmaServiceStateTracker and CdmaDataConnectionTracker are running in
the same process so that the CdmaDataConnectionTracker is not able to process the
message to deactive data before the loop ends.
The patch includes the following changes:
1) In setPowerStateToDesired() in CdmaServiceStateTracker, replace implementation
of loop-delay by sending a delayed msg to set RADIO_POWER off.
2) In CdmaDataConnectionTracker, when getting EVENT_DISCONNECT_DONE, call a new
method in CdmaServiceStateTracker to process pending request to turn RADIO_POWER
off.
Merge commit 'e6a9bcb7e8280512b0f68230fb72a004f86c8ae1'
* commit 'e6a9bcb7e8280512b0f68230fb72a004f86c8ae1':
A hack that when restartRadio is called the CdmaDataConnectionTracker
to retry a connection and possibly reconnect after a temporary data loss.
The root cause appears to be because DEACTIVATE and POWER_RADIO_OFF are
sent back to back and POWER_RADIO_OFF completes before DEACTIVATE.
When this happens CdmaDataConnectionTracker won't attempt to reestablish
a data connection until a voice call terminates.
At this time it appears the better solution is have CdmaDataConnectionTracker
wait for DEACTIVATE to complete before issuing POWER_RADIO_OFF, this fix
will be implemented in the near future.
and when data roaming is enabled reset the retry manager.
This change also refactors mRetryMgr to DataConnectionTracker
removing it from Cdma and Gsm data connection trackers child classes.
Merge commit '549db46cb31725a66cd32ad4e0abb0d60d893fca'
* commit '549db46cb31725a66cd32ad4e0abb0d60d893fca':
Fix aapt to be able to add configs from overlays.
- changed the IAccountManager API to use oneway IPCs
- changed the AccountManager to not have to start a thread for any of the calls (versus every call)
Merge commit '7193a58763ff73ba84bf4ac1c8f3f745b0a18836'
* commit '7193a58763ff73ba84bf4ac1c8f3f745b0a18836':
make sure to update a surface's usage bits when it changes, instead of only the first time.
Merge commit '82726f045de91b899502a54ca76d234c43a1ba4b'
* commit '82726f045de91b899502a54ca76d234c43a1ba4b':
ConnectivityService: Do not send broadcasts until the system is ready.
Merge commit 'c650bf583dbed8701da9a49b9dbd9023768f0df8'
* commit 'c650bf583dbed8701da9a49b9dbd9023768f0df8':
Get rid of Settings.getJIDResource(), which really should live in GTalkService. Add API to store the JID resource in IM provider settings.
Merge commit 'a8dfe24da014b52d7ae93c3fbd7a8b88ec336572'
* commit 'a8dfe24da014b52d7ae93c3fbd7a8b88ec336572':
Adds the ability to configure the mock Geolocation service from DumpRenderTree.
Merge commit '68e530047786b4f9d219d17652d7429e6e5a21bd'
* commit '68e530047786b4f9d219d17652d7429e6e5a21bd':
The local loaders assume the url given to them is decoded.
Decode the url before passing down to the local loaders since they do not decode
the url themselves. This was creating a crash on youtube.com since the data url
was percent-encoded and failing to parse from base64.
Merge commit 'a31deaf4a960058e533da35d6229f7aa8d4f00c1'
* commit 'a31deaf4a960058e533da35d6229f7aa8d4f00c1':
fix a bug that could cause a window to be hidden in some cases.
