Merge commit '6e98c280f792932d60bf9374c8979d9eadce2d9c' into gingerbread-plus-aosp
* commit '6e98c280f792932d60bf9374c8979d9eadce2d9c':
Fix for IndexOutOfBounds in setComposingRegion.
Merge commit '49a8bbf4eacbf0bde71bab05be0ab40488df109c' into gingerbread-plus-aosp
* commit '49a8bbf4eacbf0bde71bab05be0ab40488df109c':
Don't crash if we've never gotten a signal strength update.
It looks like this timing bug has been there forever, and we're just starting to hit it now.
Bug: 3027952
Change-Id: I5c14ccd7f74205dc6930f4282cec0e23eeb54cab
Merge commit '903fc221068d02bdb53ba2a48f86339caf405259' into gingerbread-plus-aosp
* commit '903fc221068d02bdb53ba2a48f86339caf405259':
Ignore errors from correction parameter query and config for M4v and H263 encoders
Merge commit '697bd76e427f00584a0e026ceca2f4d39215cd0d' into gingerbread-plus-aosp
* commit '697bd76e427f00584a0e026ceca2f4d39215cd0d':
Use the advertised profile and level from M4V and H263 video encoders
Merge commit '75c3853ec5e4bb306fa4a614e5005df1a4e75b92' into gingerbread-plus-aosp
* commit '75c3853ec5e4bb306fa4a614e5005df1a4e75b92':
SIP: Make SipAudioCallImpl use SimpleSessionDescription instead of javax.sdp.
SDP: Add a simple class to help manipulate session descriptions.
RTP: Add log throttle for "no data".
RTP: Update native part to reflect the API change.
RTP: Add two getters to retrieve the current configuration from AudioStream.
RTP: Extend codec capability and update the APIs.
* changes:
SIP: Make SipAudioCallImpl use SimpleSessionDescription instead of javax.sdp.
SDP: Add a simple class to help manipulate session descriptions.
RTP: Add log throttle for "no data".
RTP: Update native part to reflect the API change.
RTP: Add two getters to retrieve the current configuration from AudioStream.
RTP: Extend codec capability and update the APIs.
1. Rename LargeBitmap to BitmapRegionDecoder
2. Move the instantiations of BitmapRegionDecoder out of BitmapFactory.
3. Remove the use of MemoryFile in BitmapRegionDecoder, since MemoryFile's API had been modified in master. Otherwise, the change will break the master build.
4. Move AssetStreamAdaptor, AutoFDSeek and nullObjectReturn to Utils.h because BitmapFactory.cpp and BitmapRegionDecoder.cpp both need to use these utility functions.
Most of the modifications, except for (2) and (3), were reviewed in https://android-git.corp.google.com/g/#change,64716 .
However, that change broke the master build due to (3) and was reverted eventually.
So, instead of withdrawing this change and waiting for that change to be checked in again, I merge the two changes into one.
Change-Id: I2202c0fbbbd6d6676bbd9637e690023ea4099c40
Merge commit 'e81894201979513de87269a21a1802da72d2b954' into gingerbread-plus-aosp
* commit 'e81894201979513de87269a21a1802da72d2b954':
DO NOT MERGE Apply new styles to the status bar/notification shade
Merge commit '89647b1172cdf40a3681922150122b0bd2ea83f1' into gingerbread-plus-aosp
* commit '89647b1172cdf40a3681922150122b0bd2ea83f1':
Don't do single byte writes in DropBoxManagerService
Merge commit '8310b42fbc086b0f05fc8ef45ac34c7e099c485e' into gingerbread-plus-aosp
* commit '8310b42fbc086b0f05fc8ef45ac34c7e099c485e':
Add javadoc saying that wake locks are ref counted by default.
If the sending of the command fails we should note it and not wait forever
for the response.
We should also not say we're ready until we actually are.
bug:2993205
Change-Id: I380f0312ac4693ad184a526b330fdfa23f6ac558
Merge commit '95f600b55f617fcc94985fee07927aff48160362' into gingerbread-plus-aosp
* commit '95f600b55f617fcc94985fee07927aff48160362':
Fix NPE in PowerManagerService on boot, if some settings are corrupted.
Merge commit '08959c6396b8a52194554f961ae8fd874c994e4e' into gingerbread-plus-aosp
* commit '08959c6396b8a52194554f961ae8fd874c994e4e':
Request permission for global audio effects.
Merge commit '127146ee1c716d785fd70207045625c0c1f1d1ef' into gingerbread-plus-aosp
* commit '127146ee1c716d785fd70207045625c0c1f1d1ef':
Decrease sensitivity of orientation changes a bit.
Merge commit '3efbc55545673f3988cb1b2934b903d78f8873cd' into gingerbread-plus-aosp
* commit '3efbc55545673f3988cb1b2934b903d78f8873cd':
Fix more audio effects auto tests
Applications creating an audio effect on the output mix must
have the MODIFY_AUDIO_SETTINGS permission.
Change-Id: I57d88533f91ad0d33680107d79abcec28f7263b5
Merge commit 'a72bb404ceb11ac551825226eb75d2a280deb1b2' into gingerbread-plus-aosp
* commit 'a72bb404ceb11ac551825226eb75d2a280deb1b2':
Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs.
Merge commit '9d5fac517463526450268bf6353e32c13a8cdd0c' into gingerbread-plus-aosp
* commit '9d5fac517463526450268bf6353e32c13a8cdd0c':
fix small bug in EGL error management
commit 672c0dc3a04cb149691603342c319994e21235cb broke the energy probe
used by auto tests to verify that an effect is actually enabled.
The probe is based on the Visualizer which now scales the capture to maximise
the signal level: this prevents from detecting level changes between subsequent captures.
Playing sound at a lower volume moves the signal level out of the range where
scalling occurs and makes comparison possible again.
Change-Id: Ib56dec6e619c6d778dcc3ca6453091bf6136f290
