Merge commit '8fc6f8b2152564cab6ede025644f9bc3ee61ce16'
* commit '8fc6f8b2152564cab6ede025644f9bc3ee61ce16':
Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."
Merge commit '1b214be92ac206d8ac6ef4967db6e2859d91ab49' into gingerbread-plus-aosp
* commit '1b214be92ac206d8ac6ef4967db6e2859d91ab49':
Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."
this test crashes on Passion, and runs webcore into a bad state on
Stingray. To make sure it does not block the entire layout test
suite on Stingray, skipping this test for now.
http://b/2982500
Change-Id: Id4875112705df9b2c5b003a2c32c292765ab17fc
Merge commit 'f870ee81089ddf5e0388f8b4c7b6a1d437d39ce0'
* commit 'f870ee81089ddf5e0388f8b4c7b6a1d437d39ce0':
SipPhone: switch to its own phone type PHONE_TYPE_SIP.
Merge commit 'd580eee29b50e1f11485b655fe5e6cc5a564615b' into gingerbread-plus-aosp
* commit 'd580eee29b50e1f11485b655fe5e6cc5a564615b':
SipPhone: switch to its own phone type PHONE_TYPE_SIP.
Merge commit 'a19ef306bd0a257c67b50f5e0e669e9fe52b0889' into gingerbread-plus-aosp
* commit 'a19ef306bd0a257c67b50f5e0e669e9fe52b0889':
Revert "Free created FileMap when uncompressing files"
This reverts commit 52b8235238fb4d8cf141020cc1ae33880929dc3f.
munmap() on a region that overlaps something else (e.g, the ZIP Central
Directory in this case) unmaps those other regions as well making the
ZipFileRO class unhappy. Revert this for now until we can have FileMap
deal with this craziness.
Merge commit '2ae3718b448cdc5e94b4686795301a01f54640e4'
* commit '2ae3718b448cdc5e94b4686795301a01f54640e4':
Made text selection work in ExtractEditText. DO NOT MERGE
Merge commit '883bbb72284736b5601f9e96d1116969c51b75de' into gingerbread-plus-aosp
* commit '883bbb72284736b5601f9e96d1116969c51b75de':
Hide mCursorController field in ArrowKeyMovementMethod.
Merge commit 'dbd25cdbc3dcad573aaeaf493bc186006bce3d8e' into gingerbread-plus-aosp
* commit 'dbd25cdbc3dcad573aaeaf493bc186006bce3d8e':
Made text selection work in ExtractEditText. DO NOT MERGE
Merge commit '59a5d2d5772f41578c72f48df08c0af918b6519c'
* commit '59a5d2d5772f41578c72f48df08c0af918b6519c':
Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE
Merge commit 'a295a3908befeb9dd30203c612d95411d68492ed'
* commit 'a295a3908befeb9dd30203c612d95411d68492ed':
Rename LargeBitmap to BitmapRegionDecoder for having a better API.
Merge commit 'a1205f07a6f0c745e8f42f16fe38c06af04143c7'
* commit 'a1205f07a6f0c745e8f42f16fe38c06af04143c7':
Modify native ALooper to take an explicit ident.
Change insertion point on tap is no longer handled by the CommitSelectionReceiver
(as it is not called by ExtractEditText).
Fixed a bug to handle drawing positions when the internal TextView scroller is used.
Change-Id: I87398c7109c5527d21dee6abbdb925848244d594
Part of the race existed before, but it was made much worse with
apply().
Corresponding CTS test is Icc6e638a6a
Change-Id: Ic5cfa467fb7f1859cb7b44d417412219c0621965
Merge commit 'd0f74ae081bac9a9c8f7faf9288305647735d743' into gingerbread-plus-aosp
* commit 'd0f74ae081bac9a9c8f7faf9288305647735d743':
Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE
Merge commit 'b356f8acec9fdfd36f01e5cca4fe3a28ecd6e628' into gingerbread-plus-aosp
* commit 'b356f8acec9fdfd36f01e5cca4fe3a28ecd6e628':
Rename LargeBitmap to BitmapRegionDecoder for having a better API.
Merge commit '2d3739d479d67ba736cefbdd6087a11eadfb14ea' into gingerbread-plus-aosp
* commit '2d3739d479d67ba736cefbdd6087a11eadfb14ea':
Modify native ALooper to take an explicit ident.
The ALooper API now uses an explicit "identifier" for the integer
that is returned rather than implicitly using the fd. This allows
the APIs that had the fd to be a little more sane.
Change-Id: I8507f535ad484c0bdc4a1bd016d87bb09acd7ff0
Merge commit '254293782a94652fd601d6b3f04ad447c072f714' into gingerbread-plus-aosp
* commit '254293782a94652fd601d6b3f04ad447c072f714':
Allow installd to handle large partitions
