Merge commit '693a430cff3c9fac503b5005e9fd5419611eddde'
* commit '693a430cff3c9fac503b5005e9fd5419611eddde':
Ignore errors from correction parameter query and config for M4v and H263 encoders
Merge commit '30c7e132171edf41a787d6e29d169ac467f6f1ae'
* commit '30c7e132171edf41a787d6e29d169ac467f6f1ae':
Use the advertised profile and level from M4V and H263 video encoders
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
When the user clicks to AutoFill the form, we propogate a message
to WebCore through WebViewCore to actually perform the action.
Corresponding change in external/webkit needed to implement the
native method that gets called to execute
Change-Id: I6c75ab9b2c5404580de549b69102ab9374493c34
When HTTP authentication results in the user being prompted for a username
and password, this is handled asynchronously in the UI thread. However, we
can't post the result back to the WebKit thread in the normal way because
WebKit does not pump its message queue during synchronous requests.
Instead, we call WebKit directly from the UI thread and let it handle the
threading. This is safe to do because we're using thread-safe STL and
Chrome objects, not WebCore objects.
Change-Id: I79c21510186c2352f842c4ff4311687ec40ba45f
- added showInputMethodSubtypePicker to public API
-- show the selector dialog for subtypes
- added getter, setter and event handler to InputMethodManagerService
- extract InputMethodSubtype to the top level class for using it in aidl
- TODO: make an enabler for input method subtypes
- TODO: handle the event of changing an input method subtype in LatinIME
Change-Id: I49f8c6675ac4b06511635d14a37bd398738eff33
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>
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.
