Merge commit 'b74a239fd2e729c41b0cb87cbc606530ed631a41' into froyo-plus-aosp
* commit 'b74a239fd2e729c41b0cb87cbc606530ed631a41':
String change to refer to wifi tether as hotspot
Merge commit '62c28caee4a26e106134264f917bacef77438483' into froyo-plus-aosp
* commit '62c28caee4a26e106134264f917bacef77438483':
docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc
Merge commit '7d16737668685b5b4e6158a6ff6f79a92ed3b4d9' into froyo-plus-aosp
* commit '7d16737668685b5b4e6158a6ff6f79a92ed3b4d9':
Add unit test for passing thread priority & cgroup through Binder.
Merge commit 'c4c42eef9a62846a152094d61987e6dd2728e417' into froyo-plus-aosp
* commit 'c4c42eef9a62846a152094d61987e6dd2728e417':
docs: add default value and compatibility info for installLocation
Merge commit 'c6cb8a78d03cda44a49a990b4d4153560bee7420' into froyo-plus-aosp
* commit 'c6cb8a78d03cda44a49a990b4d4153560bee7420':
docs: revisions to the new resources doc based on editorial feedback
Merge commit 'd13efb20089e44e6958cb9704864c03821f19e1c' into froyo-plus-aosp
* commit 'd13efb20089e44e6958cb9704864c03821f19e1c':
A new OggExtractor/VorbisDecoder combo to support approximate seeking.
Merge commit 'c69775d616c25d31dcea119ab1e7af19148853e2' into froyo-plus-aosp
* commit 'c69775d616c25d31dcea119ab1e7af19148853e2':
fix [2664345] Flash: Bad flicker at the end of a pinch zoom.
LocationManagerService was just checking if the string of (comma-separated)
Location Providers contained the provider we were interested in. This works
fine in normal cases, but breaks if we add a provider such as test_network.
Enabling test_network causes LocationManagerService to think that the network
provider is also enabled.
The code in Settings.Secure.isLocationProviderEnabled() checks for the commas
in the string as well, to make sure that a provider name which is a substring
of another provider name won't cause problems. It also centralizes the code
which reads the string.
Signed-off-by: Brad Larson <brad.larson@garmin.com>
Change-Id: I00dfe7c2b09739ed4c8ed07c6167e409b0bf7d13
Merge commit 'e616553ebc895bef22b7e9e1d1d4b6cffdbe82fe' into froyo-plus-aosp
* commit 'e616553ebc895bef22b7e9e1d1d4b6cffdbe82fe':
Updaing preloaded classes with removal of OpenSSLSocketImpl$Finalizer
Part of fixing b/2663512: "java.io.IOException: SSL shutdown failed.: Ok" shouldn't dump a stacktrace
Change-Id: Ic6070ab9abb58c08eb7c5d8648424f582bb48e1c
This test actually exposes some bugs -- the test passes as written, but
certain parts are commented out with references to the bugs in question.
Bug: 2665914
Bug: 2665954
Change-Id: I61220e0efadc4edbb6ad419d26fa1f0f50bbc24c
Merge commit 'e50b940f153070a631a6c0d426cb7f3207042659' into froyo-plus-aosp
* commit 'e50b940f153070a631a6c0d426cb7f3207042659':
Doc Change: cherry-pick doc change from master. -> Add images for the index file for the SpinnerTest test application sample.
the window manger puts SurfaceViews up before they have been
rendered into, because of that surfaceflinger doesn't have
anything ready to draw for that surface when an udpate occurs
and responds by filling the surface with black.
With this fix, we only fill those areas of the framebuffer
that would otherwise be undefined (no content at all).
in the Flash case, the "flash" window is not drawn at all
until it has some content, instead the underlaying browser
window is shown.
Change-Id: Ifb610f7f8c27b88edf83e09adc4803fc295c15a1
Merge commit '8a8658a5de261c2da72d431940877bd054bc9837' into froyo-plus-aosp
* commit '8a8658a5de261c2da72d431940877bd054bc9837':
Make static versions of libutils and libbinder.
When we switch to another network (or even just lose mobile data) the mobile
interface is either brought down or destroyed altogether. That means any
throttling rules we've told the kernel about get lost.
This change notices when our interface comes up and reinstates throttling
if needed.
bug:2660287
Change-Id: I4c6ebf78acc59ed66b95984a1e8b7c2ffbc22dcb
Merge commit '11505b474b16457fb65952aadba0609cb33de8e7' into froyo-plus-aosp
* commit '11505b474b16457fb65952aadba0609cb33de8e7':
Avoid UNKNOWN state for Wifi in bug2542613, not a common user case.
Merge commit '639a7fc2c2d0bda12fef0c822bb2e3c002d5c5b4' into froyo-plus-aosp
* commit '639a7fc2c2d0bda12fef0c822bb2e3c002d5c5b4':
Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils.
