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 '37e3f49fb4b5ac23a985ab12b7951523be54b688'
* commit '37e3f49fb4b5ac23a985ab12b7951523be54b688':
DO NOT MERGE Apply new styles to the status bar/notification shade
Merge commit 'e81894201979513de87269a21a1802da72d2b954' into gingerbread-plus-aosp
* commit 'e81894201979513de87269a21a1802da72d2b954':
DO NOT MERGE Apply new styles to the status bar/notification shade
Fixes a "no such column" exception in MediaProvider.update() that I somehow
missed when testing the MediaProvider refactoring.
Change-Id: Icc502a5c0e3bd150b353972d000b978a9e044abc
Signed-off-by: Mike Lockwood <lockwood@android.com>
2. Invalidate transitions when trimming video
3. Remove image file when removing an OverlayFrame
4. Bug fixes in the VideoEditor implementation
Change-Id: I7bd3c888848edaf659a4faef14ad1c5a6603c3cc
to DISABLE the h/w composer:
adb shell service call SurfaceFlinger 1008 i32 1
to ENABLE the h/w composer:
adb shell service call SurfaceFlinger 1008 i32 0
the state is dumped in "dumpsys SurfaceFlinger"
Change-Id: I23e2242d42c6e3fd5261a83332dd900b189e38ce
Merge commit '1c3846979a657e4e2b1f7864fa6defb65b3bbf42'
* commit '1c3846979a657e4e2b1f7864fa6defb65b3bbf42':
Don't do single byte writes in DropBoxManagerService
Merge commit '89647b1172cdf40a3681922150122b0bd2ea83f1' into gingerbread-plus-aosp
* commit '89647b1172cdf40a3681922150122b0bd2ea83f1':
Don't do single byte writes in DropBoxManagerService
Merge commit '19c4b29d46aece70dbe532ba9078c904fbc62502'
* commit '19c4b29d46aece70dbe532ba9078c904fbc62502':
Add javadoc saying that wake locks are ref counted by default.
Merge commit '8310b42fbc086b0f05fc8ef45ac34c7e099c485e' into gingerbread-plus-aosp
* commit '8310b42fbc086b0f05fc8ef45ac34c7e099c485e':
Add javadoc saying that wake locks are ref counted by default.
Merge commit 'abdd2c7f03651e95424133c2be948238c6dc7bf6'
* commit 'abdd2c7f03651e95424133c2be948238c6dc7bf6':
Fix NPE in PowerManagerService on boot, if some settings are corrupted.
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
