Merge commit '14bfa398a4e8697ce5822861a684b7d1245e4a85' into gingerbread-plus-aosp
* commit '14bfa398a4e8697ce5822861a684b7d1245e4a85':
Infrastructure to report running services to developer.
Merge commit 'eab07e5c1d48d45f76ac2dd4a45c8a3457aa290d' into gingerbread-plus-aosp
* commit 'eab07e5c1d48d45f76ac2dd4a45c8a3457aa290d':
Report sensor events to BatteryStats service
Merge commit 'a13a02cd0ec6c0584fc2423feb974d77d0945964' into gingerbread-plus-aosp
* commit 'a13a02cd0ec6c0584fc2423feb974d77d0945964':
New permission for non-purgeable cache downloads.
Merge commit 'f72181c60943dcfb642aac1dc5fa5416c1bb566e' into gingerbread-plus-aosp
* commit 'f72181c60943dcfb642aac1dc5fa5416c1bb566e':
Fix hosttests to use the new ddmlib API.
Merge commit 'f5c7310152cf5537be6997412c1a42dde9fe9ecf' into gingerbread-plus-aosp
* commit 'f5c7310152cf5537be6997412c1a42dde9fe9ecf':
dependent change for "parse instrumentation result bundles" in sdk
This permission allows an app to use the public download manager API
to download files to the cache partition that won't be automatically
deleted when the download manager needs space.
Change-Id: Id9a5cd61c940df22765b358290b8ad8ceeff493e
Downloading images over a slow connection could result in errors and
null images.
The JavaInputStreamAdaptor::do_skip method was correctly called in a
loop (to handle the EOF case using read()), but the amount that was
skipped at each time was not decreased by the amount already skipped.
Bug http://code.google.com/p/android/issues/detail?id=6066
Cherry picked from master CL57808
Change-Id: Ie6856898b21ba31de1209e1f995b4ae784c919b9
Merge commit 'b8e07a51c1849d6894c5773a3daacedd01294218' into gingerbread-plus-aosp
* commit 'b8e07a51c1849d6894c5773a3daacedd01294218':
DL manager support for broadcasts + connectivity control
I'm removing this currently unused functionality from the Download
Manager implementation, so the constant might as well go.
Change-Id: I4f0970211201881a8426b83b5275408cd14c3377
* Additions to DownloadManager to support control of broadcast intents, allowed network types, and roaming control. This includes new constants and added implementation.
* New DB columns to hold connectivity flags and one to indicate whether the download was initiated through the public API; this is used to change behavior related to broadcast intents and connectivity controls.
Change-Id: I2e8e4ce92cde7889a0f24dc43b86c596c73c0eaa
Merge commit 'e4764521353e898554931a557460fc49209fb0a9' into gingerbread-plus-aosp
* commit 'e4764521353e898554931a557460fc49209fb0a9':
new SensorService
We can't use Parcel.writeValue() to write the ParcelFileDescriptor, otherwise
it leaks when returning the value to the caller (the flag gets lost). Change
the way DropBoxManager.Entry gets serialized so that it uses a bit of its own
flags value to track whether the data is a byte[] or a ParcelFileDescriptor.
Modify the dropbox unit test to add extensive checking of Entry serialization
and deserialization under various circumstances, and to include a regression
test to ensure that FD leaking doesn't happen.
Bug: 2847738
Change-Id: I4ccd17dd03ffab234340cd359e6f3510fdf81193
Merge commit '92010ff5cf014c0ff73ee4ad4bb169dd916a15a9' into gingerbread-plus-aosp
* commit '92010ff5cf014c0ff73ee4ad4bb169dd916a15a9':
Fix a merge problem with html mms
Merge commit 'dbac180d8342a7db2bb9994f937869eecb6b50ff' into gingerbread
* commit 'dbac180d8342a7db2bb9994f937869eecb6b50ff':
Fix a merge problem with html mms
Html mms message support was added back in Jan '10. At that time, we
had moved the mms code out of the framework into the mms app. We decided
to back out that change and leave the mms code in its original place.
As a result, the changes to support html messages were lost. This
handmerged CL restores those changes. I'll cherry-pick this into master
as well. Bug 2858888
Change-Id: Icf8835edc8ac396698c167be5433a6fe1cfe6103
Merge commit '7070b36549d511d6627538c73dfbab23fbae5b43' into gingerbread-plus-aosp
* commit '7070b36549d511d6627538c73dfbab23fbae5b43':
Added support for auxiliary audio effects to AudioTrack and MediaPlayer.
Added methods to AudioTrack and MediaPlayer java classes to enable use of
auxiliary audio effects. The effect can be attached and detached by specifying its
ID and the send level controlled.
Change-Id: Ie74ff54a453096a742688476f612ce355543b6f3
Merge commit '29e25bd3418b04e395119bf99abe92898830a796' into gingerbread-plus-aosp
* commit '29e25bd3418b04e395119bf99abe92898830a796':
Only print out wake locks in the if the wakelock was held.
Merge commit '3c1363beec9c142c062d8704b8bef4230b42eae5' into gingerbread-plus-aosp
* commit '3c1363beec9c142c062d8704b8bef4230b42eae5':
COMMENT ONLY change to add some warnings about ParcelFileDescriptor
Merge commit '2f0dc6d9f50ceece294e9db393583e655d3bf781' into gingerbread
* commit '2f0dc6d9f50ceece294e9db393583e655d3bf781':
COMMENT ONLY change to add some warnings about ParcelFileDescriptor
Merge commit 'fb1c0fe7fda72c29ac333f0f7d18c36d797a7a4a' into gingerbread-plus-aosp
* commit 'fb1c0fe7fda72c29ac333f0f7d18c36d797a7a4a':
COMMENT-ONLY change to clarify Camera documentation.
newDrawable and change the name from 'DrawableCacheClear' to 'clearDrawableCache'
(additional changes for ID:15815)
https://review.source.android.com/#change,15815
Change-Id: I6bf19b8e6e187df8c8e3cb57d9e04278ddfe5055
