Merge commit '10f7c1b8ecf110fd9c646eb3fcb51e6ee74c5885' into gingerbread-plus-aosp
* commit '10f7c1b8ecf110fd9c646eb3fcb51e6ee74c5885':
Explicitly mention again that startCommand() runs on the main thread.
Merge commit '84c924a6c53cb63ca018013c9fda0077413d0005' into gingerbread-plus-aosp
* commit '84c924a6c53cb63ca018013c9fda0077413d0005':
Replace several IPCThreadState::get() lookups with one.
Merge commit '499bee34c40945f898b7561ca7792ded5b974852' into gingerbread-plus-aosp
* commit '499bee34c40945f898b7561ca7792ded5b974852':
Remove a log message Jason doesn't like
Merge commit '76d9bf52f31b8f31f64348b736422861c90ab463' into gingerbread-plus-aosp
* commit '76d9bf52f31b8f31f64348b736422861c90ab463':
Add a method to let a properly permissioned app directly
Merge commit '8c65ee2d509db7dcb50ce4530d52eb5bdca3f917' into gingerbread
* commit '8c65ee2d509db7dcb50ce4530d52eb5bdca3f917':
Add a method to let a properly permissioned app directly
Merge commit 'ca57d1cc89d65dfbd59c749c5736574cd08c7bd3' into gingerbread-plus-aosp
* commit 'ca57d1cc89d65dfbd59c749c5736574cd08c7bd3':
Audio Effects: added methods to effects java classes to store and load current effect settings in
rework how our EGL wrapper manages EGLConfig:
- we now store the EGLConfig with the EGLSurface and EGLContext
so that we can have easy access to it from eglQueryContext
and eglQuerySurface.
- EGLConfig now are an index into a sorted table of egl_config_t,
we use a binary search to retrieve our EGLConfig (the index) from
the implementation's EGLConfig.
- egl_config_t keeps track of the implementation's index,
EGLConfig and CONFIG_ID as well as our CONFIG_ID.
In many ways, this implementation is simpler and more robust, as it doesn't
assume anything about the number of implementations nor what EGLConfig is
made of (the previous code assumed EGLConfig didn't usem more than 24-bits).
Change-Id: Id5abe923aacb6e1fd2b63bd8c15d7b04ae824922
Merge commit '4a60d61887a20d349e5eb38900dfbcaab06630fc' into gingerbread-plus-aosp
* commit '4a60d61887a20d349e5eb38900dfbcaab06630fc':
Fix NPE in TextToSpeech with setLanguage(null)
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 'f88ed6c2ce750fcf7fb23778286e15557de758f9' into gingerbread-plus-aosp
* commit 'f88ed6c2ce750fcf7fb23778286e15557de758f9':
SensorService handles last known state properly
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
Merge commit '4782cdbbbe4b2c7714af1fb6cdc4f52f1d1d20d7' into gingerbread-plus-aosp
* commit '4782cdbbbe4b2c7714af1fb6cdc4f52f1d1d20d7':
Fix a memory corruption when writting Sensor into a parcel