Merge commit '94f3a36326ddecaa09787d795451b0a229fe111c'
* commit '94f3a36326ddecaa09787d795451b0a229fe111c':
Remove STOPSHIP BT logging.
BT API security audit: fix a couple of permission mistakes.
Fix issue #2175693: Add vmallocinfo to dumpstate
add a way to easily catch and log GL errors (compile time flag)
GPS: Fix problem with SUPL when SUPL APN is already active.
Import revised translations. DO NOT MERGE
Fix issue 2174002: After rejecting Call when device ringtone is mute and playing music, audio is not transfered to BT device.
Import revised translations. DO NOT MERGE
Merge commit '1c83540e3829dc9664728f1f017686f16f61a4ea'
* commit '1c83540e3829dc9664728f1f017686f16f61a4ea':
Some decoders will return an error on OMX_EmptyThisBuffer to indicate that they don't support the media format, deal with this.
Merge commit '6036288ad953e56433a9936fad09213b328cad71'
* commit '6036288ad953e56433a9936fad09213b328cad71':
Make FWK start a wifi scan if supplicant forgets.
Merge commit '39c923a94c377a75e34153f6dddb83fc9883d2a7'
* commit '39c923a94c377a75e34153f6dddb83fc9883d2a7':
Insert a small delay after submitting to surface flinger and before returning the buffer to the decoder.
Merge commit '0221ec55ac57f32a42fb1e7b66779ca955d58558'
* commit '0221ec55ac57f32a42fb1e7b66779ca955d58558':
Control H icon display in Status bar.
Fixes#2175599. Prevents an NPE when AttachInfo is null.
Set the Bond State to NONE when we receive a Agent Cancel.
Make vCard import Photo from vCard file :(
Merge commit 'a6b76c35a482bd7f2cbab186aca9ea6e74a375d0'
* commit 'a6b76c35a482bd7f2cbab186aca9ea6e74a375d0':
The vendor is about to check in a fix for this issue, the workaround is no longer needed
Merge commit 'ec61707d39c14950f53795b0610ea1ee00daecdb'
* commit 'ec61707d39c14950f53795b0610ea1ee00daecdb':
fix an NPE on a race condition that occurs when unbinding from an authenticator at the samer time that its process dies: bug 2171204
Merge commit '9136c39d4933bcf60bff0f76bc377d1985736ea5'
* commit '9136c39d4933bcf60bff0f76bc377d1985736ea5':
Retry overlay create if it fails. Bug 2153980.
Add script to script call support. Add exception to catch out of bound index data when added to TriangleMeshBuilder.
fix [2170283] SurfaceFlinger crashes on OOM.
fix [2164183] sometimes device just wants to stay asleep
when logging free space on /data, log /system and /cache as well
Until now we had been throwing UnsupportedOperationException when
developers tried to use the GL11 or GL11Ext methods. Now we handle
these methods correctly, passing their arguments through to the
wrapped interface's methods.
Fixes bug 2167522 GLUtils debug wrapper doesn't support GL11 features
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-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 '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"
