Merge commit 'ef703f60d5c00527048fdaf1c24984762f6fd434' into eclair-mr2-plus-aosp
* commit 'ef703f60d5c00527048fdaf1c24984762f6fd434':
Change to a int64_t usecs representation for timestamps and duration throughout stagefright.
Merge commit '7c6770c26ba819bcad3d9522e046f9d1fdf9e222' into eclair-mr2-plus-aosp
* commit '7c6770c26ba819bcad3d9522e046f9d1fdf9e222':
Add the flag "FLAG_APPEND_TYPE_PARAM" to VCardConfig, which
Merge commit 'd48e25d4e3278c5e975db01adb98661ee59923fe' into eclair-mr2-plus-aosp
* commit 'd48e25d4e3278c5e975db01adb98661ee59923fe':
Add a new TestSuites: VCardTests
Now, the following command is available.
adb shell am instrument -w -e class com.android.unit_tests.vcard.VCardTests com.android.unit_tests/android.test.InstrumentationTestRunner
Internal Issuer number: 2160039
Merge commit 'edb988128e5b14b46c692d19ea4f536d7daa7b39' into eclair-mr2-plus-aosp
* commit 'edb988128e5b14b46c692d19ea4f536d7daa7b39':
Make standard roaming indicator display indications configurable
Merge commit 'febb94cdbb7c7b7091401d21824bfab32b9daca5' into eclair-plus-aosp
* commit 'febb94cdbb7c7b7091401d21824bfab32b9daca5':
Make standard roaming indicator display indications configurable
Merge commit 'febb94cdbb7c7b7091401d21824bfab32b9daca5' into eclair-mr2
* commit 'febb94cdbb7c7b7091401d21824bfab32b9daca5':
Make standard roaming indicator display indications configurable
Allow the ERI overlay file to specify the text for any built-in strings.
Currently only the hard-coded strings are used for those.
Bug: 2170881
Change-Id: I5d6169696a4558e62587585e17f908f823c54a2b
Merge commit '347daf3a9802b2a4184ff8aa90b4af6c5de79ab7' into eclair-mr2-plus-aosp
* commit '347daf3a9802b2a4184ff8aa90b4af6c5de79ab7':
Implement unit tests for vCard exporter, which depends on the sucess in vCard importer.
In order to share the logic between tests for importer and those for exporter,
PropertyNodesVerifier is now a separated class and drastically modified.
Now the class accept "unordered" expected PropertyNode objects, which allows vCard
composer to not care the exact order of each elements.
MockCursor is added, which may be added into the public API in the future, but in
the test directory for now.
Another MockContentProvider is (temporarily) developed so that it can be accepted by
MockContentResolver#addProvider(), which does not allow IContentProvider and its
descendants but only exact ContentProvider, while the original MockContentProvider in
android.test.mock.MockContentProvider implements IContentProvider.
The test development is still on-going, but this test suffices minimal requirement of
vCard tests.
Internal issue number: 2160039
Merge commit '89e6b425bcbecd8cb78b95c0c9a6bd4f34d25590'
* commit '89e6b425bcbecd8cb78b95c0c9a6bd4f34d25590':
Fix issue #2171460: Turn off background blurring of power dialog
Fix issue #2171766: Device can go to sleep while in dock
Merge commit '1cf6c2c3cc397333653b6f061db4ca9f5d88c7f3' into eclair-mr2-plus-aosp
* commit '1cf6c2c3cc397333653b6f061db4ca9f5d88c7f3':
Reduce the amount of EriManager Logging.
Merge commit '0c559a4b0f8918fe89921d7984001d00285f226f' into eclair-mr2-plus-aosp
* commit '0c559a4b0f8918fe89921d7984001d00285f226f':
Revert "egl: temporarily also include eglTerminate->eglInitialize hack for 8k"
Merge commit 'ff9c48b3040833c7b3f85bcac116ba5f0dd247d0'
* commit 'ff9c48b3040833c7b3f85bcac116ba5f0dd247d0':
Improve drawing cache speed by selecting the correct opacity and keeping a 32 bits
Merge commit '1e988a04b55fcaab6116b8d565b68b4f62d01633'
* commit '1e988a04b55fcaab6116b8d565b68b4f62d01633':
Workaround for avc decoder misreporting output buffer size requirements if the content is not a multiple-16 width/height.
Merge commit '254d7ecd06aabc54fb1d2b9afd53b6e78045c6a9'
* commit '254d7ecd06aabc54fb1d2b9afd53b6e78045c6a9':
add (hidden) setHasAlpha() to allow clients like the view's cache to hint that a bitmap is opaque.
Merge commit '6d02f3f3ff1962bdcf2a1dcd86b433c9614c3d84' into eclair-mr2
* commit '6d02f3f3ff1962bdcf2a1dcd86b433c9614c3d84':
Reduce the amount of EriManager Logging.
Merge commit '6d02f3f3ff1962bdcf2a1dcd86b433c9614c3d84' into eclair-plus-aosp
* commit '6d02f3f3ff1962bdcf2a1dcd86b433c9614c3d84':
Reduce the amount of EriManager Logging.
