Merge commit 'f5c7310152cf5537be6997412c1a42dde9fe9ecf' into gingerbread-plus-aosp
* commit 'f5c7310152cf5537be6997412c1a42dde9fe9ecf':
dependent change for "parse instrumentation result bundles" in sdk
Merge commit '4782cdbbbe4b2c7714af1fb6cdc4f52f1d1d20d7' into gingerbread-plus-aosp
* commit '4782cdbbbe4b2c7714af1fb6cdc4f52f1d1d20d7':
Fix a memory corruption when writting Sensor into a parcel
Merge commit '53d4e0d58e2d5c18f6e026c705af833b9bdd7aba' into gingerbread-plus-aosp
* commit '53d4e0d58e2d5c18f6e026c705af833b9bdd7aba':
Allows the authoring engine to skip frame.
This is 1st part of the work to allow audio and video resync if
we found out that audio and video are out of sync during authoring
- also fixed a problem in AACEncoder::read() where the buffer acquired
from the buffer group does not release when error out at
reading from source.
Change-Id: I8a2740097fcfdf85e6178869afeb9f3687a99118
Merge commit 'db3eb3553502d142c85d47ec4fb847b7fa3b06fa' into gingerbread-plus-aosp
* commit 'db3eb3553502d142c85d47ec4fb847b7fa3b06fa':
propagate sensor event rate properly to the sensor HAL
Merge commit '81046c8c42ff3b630c6496deafd44f2a07a25463' into gingerbread-plus-aosp
* commit '81046c8c42ff3b630c6496deafd44f2a07a25463':
Various changes to improve rtsp networking, reduce packet loss and adapt to ALooper API changes.
Merge commit 'e7486695ced2dd135f6e2223b582adde4155b917' into gingerbread-plus-aosp
* commit 'e7486695ced2dd135f6e2223b582adde4155b917':
Add missing logging for SET_TTY_MODE and QUERY_TTY_MODE
Merge commit 'b42aa98d44f1ad22746005264274220770de2756' into gingerbread-plus-aosp
* commit 'b42aa98d44f1ad22746005264274220770de2756':
Correct VM number updation during MBDN refresh.
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 '5df13ef30e7dd58e4e718e6d949ac3d1f5af94e0' into gingerbread-plus-aosp
* commit '5df13ef30e7dd58e4e718e6d949ac3d1f5af94e0':
SensorService doesn't crash if correct HAL is not present
Merge commit '865991b075de1df8144426b5c2b2f341e4e33d33' into gingerbread-plus-aosp
* commit '865991b075de1df8144426b5c2b2f341e4e33d33':
Added partial support for repporting sensor activity to IBatteryStats
Merge commit 'e4764521353e898554931a557460fc49209fb0a9' into gingerbread-plus-aosp
* commit 'e4764521353e898554931a557460fc49209fb0a9':
new SensorService
Merge commit 'ff0ab64ca49c7a03835d414cd493d5dc37c2eb5e' into gingerbread-plus-aosp
* commit 'ff0ab64ca49c7a03835d414cd493d5dc37c2eb5e':
Add a seek test to the stagefright commandline tool.
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
