Merge commit '3cf254d2ba303da3354ed65fd7f3136e87a56b9f' into eclair-plus-aosp
* commit '3cf254d2ba303da3354ed65fd7f3136e87a56b9f':
Revert the channge where channels were not selected randomly.
Merge commit '154d61fc99964bc5ad13384027f063e77b36f9eb' into eclair-plus-aosp
* commit '154d61fc99964bc5ad13384027f063e77b36f9eb':
Removed javadoc link to hidden class (temporary fix for build)
Merge commit '4388b98845e6a28c689e500cd6ed1e9bb29a2c12' into eclair-plus-aosp
* commit '4388b98845e6a28c689e500cd6ed1e9bb29a2c12':
Revert the changes that introduced new exception that wouldn't have occured before, applications don't seem to be able to handle them and we get crashes.
* changes:
Revert the changes that introduced new exception that wouldn't have occured before, applications don't seem to be able to handle them and we get crashes.
Merge commit 'b5c05516ba2c341655d54f17bdd17a5ab2d173df' into eclair-plus-aosp
* commit 'b5c05516ba2c341655d54f17bdd17a5ab2d173df':
Copy the selection args when creating a CPO since callers often reuse the passed in array.
Merge commit '22dad5928d1d1f2c791616d9d6ab3a3172cec62e' into eclair-plus-aosp
* commit '22dad5928d1d1f2c791616d9d6ab3a3172cec62e':
When upgrading packages with shared user ids make sure we are eliminating
the package about to be deleted or upgraded when updating permissions associated
with the shared user. Include a simple null check when retrieving the permission.
Fix PackageParser to avoid ArrayIndexOutOfBounds exceptions in several places
Merge commit '31957f1badbb900bbfe211317e1ea992d650a72d' into eclair-plus-aosp
* commit '31957f1badbb900bbfe211317e1ea992d650a72d':
- add javadoc for the account manager
Merge commit '5e5eb393729630800079206498f283de8f02f3a7' into eclair-plus-aosp
* commit '5e5eb393729630800079206498f283de8f02f3a7':
don't throw an exception when we can't find a pending sync operation in the database
- Added new functions to PerformanceCollector and PerformanceResultsWriter
- Modified unit tests to test new functionality and fix flakiness reported in
2218327 and 2118268
- Added PerformanceCollectorTest to small suite
Merge commit '1f668fff8ad2b8d79d42da5d9667d308fa0b9441' into eclair-plus-aosp
* commit '1f668fff8ad2b8d79d42da5d9667d308fa0b9441':
Add SDK version for MR1.
Merge commit 'aea1b3b24ee895c24ed25c5706bc2f390b41689d' into eclair-plus-aosp
* commit 'aea1b3b24ee895c24ed25c5706bc2f390b41689d':
Disambiguation between multiple pointers and swipe gestures.
Sometimes quickly touching the screen with two fingers will result
in the firmware thinking one finger moved very quickly. This code
tries to identify the difference between the two based on velocity
of the last N points versus the velocity of the last M points and
figure out if there was mostly acceleration or a sudden deceleration.
It's still not perfect and very dependent on the touch hardware.
Merge commit '6158038a09069bc178970160d4b3667573bfc655' into eclair-plus-aosp
* commit '6158038a09069bc178970160d4b3667573bfc655':
Add Authentication Type field to the APN settings.
Use auth type to setup data connection.
This value defaults to -1 (unset) to maintain compatibility.
When the value is -1, the auth type gets set to 0 (if no user is specified)
or 3.
Bug: 181700
Merge commit 'a47d153647d8750b667942ad80e7b905ea98c68b' into eclair-plus-aosp
* commit 'a47d153647d8750b667942ad80e7b905ea98c68b':
do not merge - Fix for issue 2184627 cherry picked from eclair-mr2
Bluetooth A2DP suspend-resume improvements.
This change will reduce the occurence rate of A2DP sink suspend resume failures observed in issues 2184627, 2181005 and possibly 2189628.
More robust suspend/resume logic.
Use only the suspend request to audio hardware to avoid having two concurent suspend resume control paths.
Merge commit '78a50aa1db6572ba7d9f9d91c6eb16f993c09f40' into eclair-plus-aosp
* commit '78a50aa1db6572ba7d9f9d91c6eb16f993c09f40':
Patching in hidden API to allow app managed preview frame buffers.
Merge commit '246978b8dc89562dda47fea9a7aee61949101242' into eclair-plus-aosp
* commit '246978b8dc89562dda47fea9a7aee61949101242':
Add a method to clear info about a contact
Add a method so the ContactInfoWidget will throw away the cached
info it has on a contact (e.g. picture and uri).
Change-Id: Ia8f376e356c6bcf246bbd72239c5ca2a3b7c9574
Merge commit '7580493b014a2c7ea883cd291255798dc72ebbff' into eclair-plus-aosp
* commit '7580493b014a2c7ea883cd291255798dc72ebbff':
Implement feature #2117336: Create event communication APIs for live wallpaper
