Merge commit '1a34dd69ad0132b13b99813bb1d4f37dac6ca611' into eclair-mr2-plus-aosp
* commit '1a34dd69ad0132b13b99813bb1d4f37dac6ca611':
Disable known failure math tanhd tests (DO NOT MERGE)
Merge commit 'c0e1bb88fd3029ad8a6ab4587da7bcfb127100c7'
* commit 'c0e1bb88fd3029ad8a6ab4587da7bcfb127100c7':
If we fail to persist the current settings and fall back to the back settings file
Merge commit 'f8e3ac851959efbd21da930a802f8efb65ccec5b' into eclair-mr2
* commit 'f8e3ac851959efbd21da930a802f8efb65ccec5b':
In onKeyUp for DPAD_CENTER, show the IME for text input.
Merge commit '2cb6b7fb868899a3c718280605b0e462d0f8491f' into eclair-mr2
* commit '2cb6b7fb868899a3c718280605b0e462d0f8491f':
Import revised translations. DO NOT MERGE
Merge commit '6d924c69af055559ed84afaf487aa38bd6fd2e33' into eclair-mr2-plus-aosp
* commit '6d924c69af055559ed84afaf487aa38bd6fd2e33':
If we fail to persist the current settings and fall back to the back settings file
Merge commit '785768a9216b3a631237587feffea2aeb05a91cc' into eclair-mr2
* commit '785768a9216b3a631237587feffea2aeb05a91cc':
Prevent transparent region from getting out of sync with Surface Flinger
Merge commit '6270d52c0dded8658733a392f3ef1f521bc5dbee' into eclair-mr2
* commit '6270d52c0dded8658733a392f3ef1f521bc5dbee':
Disable known failure math tanhd tests (DO NOT MERGE)
Merge commit '5b48223d0e8b8becea0c120895d964e6472b3552' into eclair-mr2
* commit '5b48223d0e8b8becea0c120895d964e6472b3552':
If we fail to persist the current settings and fall back to the back settings file
Merge commit 'f25c96609224213be07a34219a32c006ee9063f0'
* commit 'f25c96609224213be07a34219a32c006ee9063f0':
do not merge: The qcom video decoders always output yuv data after adjusting dimensions to be a multiple of 16.
Merge commit '0b3977f87b10fd78cffa0c39aaf787bfe6d108c7' into eclair-mr2-plus-aosp
* commit '0b3977f87b10fd78cffa0c39aaf787bfe6d108c7':
add "junk path" -k option to aapt (DO NOT MERGE)
Merge commit '1e23a4019a2782054fc2c72f243008e29e13b411' into eclair-mr2-plus-aosp
* commit '1e23a4019a2782054fc2c72f243008e29e13b411':
do not merge: The qcom video decoders always output yuv data after adjusting dimensions to be a multiple of 16.
Merge commit '617262d8f57362536ddc00a070c1c0994741de44' into eclair-mr2
* commit '617262d8f57362536ddc00a070c1c0994741de44':
add "junk path" -k option to aapt (DO NOT MERGE)
Merge commit 'ca404dfb920ab009cef4db5e74715b796f79b3f9' into eclair-mr2
* commit 'ca404dfb920ab009cef4db5e74715b796f79b3f9':
do not merge: The qcom video decoders always output yuv data after adjusting dimensions to be a multiple of 16.
Fixes bug b/2202165 (Often I when pressing power to turn off I get the lock screen)
Change-Id: I53f8350203d57fbb5f143edc44985879caadd78f
Signed-off-by: Mike Lockwood <lockwood@android.com>
* changes:
Fix bug 2194213: Non-default system IMEs are enabled, but not initially shown in input method switcher. - Ensure system IMEs are put on the enabled list at startup/install. - If the default IME is not installed, choose another one whenever building input method list.
- Ensure system IMEs are put on the enabled list at startup/install.
- If the default IME is not installed, choose another one whenever building input method list.
Previously we were returning "other terminal problem" to the network, but this
had the potential of blocking MT SMS messages for days at a time (eg, if the
problematic message is resent). Sending the "encoding problem" cause code is
reasonable since in most cases the we have encountered an error while trying
to parse the message.
Addresses b/2200412.
Merge commit '337b2cd674e084807cb0656b6609aae3dd02d2c0'
* commit '337b2cd674e084807cb0656b6609aae3dd02d2c0':
Add a new API for initing Wifi multicast filtering
Merge commit 'a86f1ccca0bf54f27c398b4dbb0f2f1ec7293315' into eclair-mr2-plus-aosp
* commit 'a86f1ccca0bf54f27c398b4dbb0f2f1ec7293315':
Add a new API for initing Wifi multicast filtering
Merge commit 'ae27c576643a821d78ef330a5e1834c42d2cc94a'
* commit 'ae27c576643a821d78ef330a5e1834c42d2cc94a':
Make MockCursor class a part of public SDK.
Merge commit '54616f3435e67029006d2f77462c61ed0635a3f6' into eclair-mr2-plus-aosp
* commit '54616f3435e67029006d2f77462c61ed0635a3f6':
Make MockCursor class a part of public SDK.
Merge commit '917d0aece5c9395892c3a8e7191f04a1e2ca6330'
* commit '917d0aece5c9395892c3a8e7191f04a1e2ca6330':
Some cleanup of OMXCodec code, make sure to ignore 0-length output buffers in the metadata retriever.
With this class, external developers will be able to reduce their
redundant work related to testing around ContentProvider/ContentResolver.
Internal Issue number: 2181010
Merge commit 'bfd5b38673212c47f0e386c0a8370d4ff47bd2fe' into eclair-mr2-plus-aosp
* commit 'bfd5b38673212c47f0e386c0a8370d4ff47bd2fe':
Some cleanup of OMXCodec code, make sure to ignore 0-length output buffers in the metadata retriever.
