Merge commit 'cf4f2c22cbe62843324718f657021ce0c459a3db' into eclair-mr2-plus-aosp
* commit 'cf4f2c22cbe62843324718f657021ce0c459a3db':
Support double-quote SSID in WifiService.
+ push the double-quote handling down to framework.
wpa_supplicant keeps the ssid in a quoted string in the config file. However,
the UI currently needs to handle the quoted string which makes it difficult
to handle the SSID containing the quotes. The change will move the
supplicant-specific double-quote handling from UI to framework, i.e. to
add/remove doubel-quotes in framework instead of in UI settings.
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-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"
Merge commit '6d02f3f3ff1962bdcf2a1dcd86b433c9614c3d84' into eclair-mr2
* commit '6d02f3f3ff1962bdcf2a1dcd86b433c9614c3d84':
Reduce the amount of EriManager Logging.
Merge commit '98b3def2983e78409002cf406574bbc8eeef8bfd' into eclair-mr2
* commit '98b3def2983e78409002cf406574bbc8eeef8bfd':
Revert "egl: temporarily also include eglTerminate->eglInitialize hack for 8k"
Merge commit 'bd5662a1a2e74f1be1e0a0fb4858835caf10c315' into eclair-mr2-plus-aosp
* commit 'bd5662a1a2e74f1be1e0a0fb4858835caf10c315':
add local flag to enable FPS w/o having to enable Config.DEBUG, which can have unintended costs
Merge commit '77df9d6e0ca56a34c66a1e30e9696085ddbd9038' into eclair-mr2-plus-aosp
* commit '77df9d6e0ca56a34c66a1e30e9696085ddbd9038':
Delay 500ms between each registering each SDP record using sdptool.
Merge commit '7fa610638b09f2a4a29d7df1b16d2fe686b5e5e6' into eclair-mr2-plus-aosp
* commit '7fa610638b09f2a4a29d7df1b16d2fe686b5e5e6':
Fix issue #2179931: Power key to wake up frequently ignored when in dock app
Merge commit 'd301c90446644f63cda9b9263f83332676065bb4' into eclair-mr2
* commit 'd301c90446644f63cda9b9263f83332676065bb4':
Delay 500ms between each registering each SDP record using sdptool.
Merge commit 'f836acf241f10d943d72d439fa425fda73a6d56b' into eclair-mr2
* commit 'f836acf241f10d943d72d439fa425fda73a6d56b':
Fix issue #2179931: Power key to wake up frequently ignored when in dock app
This is to workaround an issue where SDP records will fail to register using
sdptool. When we run SystemService.start() it forks sdptool, so if we do this
four times in a row these forked processes can run in parallel, and one or
more of them fails. There is probably some thready safety issue in sdptool
or Bluez that makes it unsafe to run sdptool in parallel.
As a workaround, delay 500ms between each run of sdptool to register SDP
records when starting Bluetooth.
Before this fix it was easy to reproduce problems with service record
registration. If you turn BT off/on multiple times you can see that sometimes
one or more service records are missing. Repro rate is about 20% in my tests.
Result is that remote devices cannot connect to the missing service.
After this fix I am unable to reproduce any missing SDP records, after 30+
cycles of BT on/off. Motorola BT team also ran stress tests overnight with this
fix and were unable to reproduce the missing SDP records.
This is a low risk fix. It does delay some records from being registered
by an additional 1.5 seconds (on top of the 3 second delay we already had),
so if you try and very quickly connect a BT service after turning BT on it
won't work the first time.
Do not merge. (I will use a less hacky fix for MR2/Master)
Change-Id: I305c181c3194e8ce25e3825320cc2e1ef6d3d3cc
Bug: 2180800
DrNo: eastham
Joke: Why can't you play cards in the jungle? Because there's too many cheetas!
Merge commit '5d93de7393bf01095e79af0f3586930ddd9ffeeb' into eclair-mr2-plus-aosp
* commit '5d93de7393bf01095e79af0f3586930ddd9ffeeb':
Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such.
Merge commit '1bb5550107eae60993dc35f2e917cb664f841255' into eclair-mr2-plus-aosp
* commit '1bb5550107eae60993dc35f2e917cb664f841255':
Prevent transparent region from getting out of sync with Surface Flinger
Merge commit '8a98a26aa28381bb1dcbf8bbf57706d26e3349bf' into eclair-mr2-plus-aosp
* commit '8a98a26aa28381bb1dcbf8bbf57706d26e3349bf':
Fix issue #2179891: Need to update 5.xml
