Merge commit 'f904be1659fcc88dd80be2c900ffc89e77b1c737' into eclair-plus-aosp
* commit 'f904be1659fcc88dd80be2c900ffc89e77b1c737':
disable high-quality filtering during scrolling, until I can cached the scaled images.
Merge commit '2e4e25f39ea6488ddc2b5427ec4a66edc1f8facc' into eclair-plus-aosp
* commit '2e4e25f39ea6488ddc2b5427ec4a66edc1f8facc':
Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long.
Merge commit 'a59551bade6a7b0c916c277f044de79c6af1bd22' into eclair-plus-aosp
* commit 'a59551bade6a7b0c916c277f044de79c6af1bd22':
Fix issue 2388215: Audio not routed to 3.5mm Headset after removal/insertion.
Merge commit '08cb0024026e0f42612ab569e1e4067d5ede3bf8' into eclair-plus-aosp
* commit '08cb0024026e0f42612ab569e1e4067d5ede3bf8':
Handle emergency calls only status in ServiceStateTracker.
The problem occurs if the delay between the headset removal and insertion is less than one second.
In this case, as the headset disconnection intent is broadcast with a 1 second delay to allow music to pause
before updating the route, the connection intent is broadcast before and is ignored, leaving the system
in a state where the headset is considered disconnected.
The fix consists in inserting a delay before broadcasting the connection intent if a disconnection
intent is pending broadcast.
Merge commit '9a400fa4d3e89a3ab3669c0aa2ef6676020646d1' into eclair-plus-aosp
* commit '9a400fa4d3e89a3ab3669c0aa2ef6676020646d1':
initialize sync adapters that get installed while the system is running
Merge commit '036e21083d9936425687d7de29e95b2c458a7e4a' into eclair-plus-aosp
* commit '036e21083d9936425687d7de29e95b2c458a7e4a':
Fix NPE when importing from USIM.
Merge commit 'b1780474e6e3e1d3c584166c2fde336a0cd1c43f' into eclair-plus-aosp
* commit 'b1780474e6e3e1d3c584166c2fde336a0cd1c43f':
Instead of caputre the memory footprint before and after the test. We would like to monitor the memory trend while the test is running. This can eliminate the overhead for the frist test case in creating the player.
Merge commit '495bae67ff7df4a11325a4cc1d8af288f82128fe' into eclair-plus-aosp
* commit '495bae67ff7df4a11325a4cc1d8af288f82128fe':
fix bug 2264186: clean up the outstanding async queries in ContactHeaderWidget.
- ContactHeaderWidget has cascading async queries, which weren't cancelled if a new query for a different phone number is started.
If the new query fails to find a corresponding contact, the old async queries from the previous number could end up setting the
contact name and photo to the wrong contact.
I tested this by calling
ContactHeaderWidget.bindFromPhoneNumber(number1);
ContactHeaderWidget.bindFromPhoneNumber(number2);
where number1 has a corresponding contact in the databse, and number2 doesn't. At the end of these 2 calls, the ContactHeaderWidget
would display the contact info for number1.
- also found a bug in AsyncQueryHandler.cancelOperation(), which doesn't reliably cancel the previous query. In ContactHeaderWidget's
case, we really depend on the cancelling to work. So work around this bug by resetting mAsyncQueryHandler when we need to do a
new lookup/query. When the old query result is passed back in the callback, discard the result if the QueryHandler is not the same
as mAsyncQueryHandler.
Change-Id: Ice79e77f787af03400e080cbd58162a91838181f
Merge commit '6f9e2c648c0588a2eedef2746c9750ed9c6945be' into eclair-plus-aosp
* commit '6f9e2c648c0588a2eedef2746c9750ed9c6945be':
Find layout classes in all "layout-*" dirs.
Merge commit '9fdf82e080ea20086378e751ace245a4a1b022dc' into eclair-plus-aosp
* commit '9fdf82e080ea20086378e751ace245a4a1b022dc':
Try to switch to another default net on connection failure.
Merge commit 'dcc14d6a26961a3ba45eaeb7305fdafb2b6694e2' into eclair-plus-aosp
* commit 'dcc14d6a26961a3ba45eaeb7305fdafb2b6694e2':
Use MCC value to always override channel count setting
