Merge commit '2e778c176d17c295f475141bddda9dca5cd65fce' into eclair-mr2
* commit '2e778c176d17c295f475141bddda9dca5cd65fce':
Continue caching "POST" result so that we won't get
+ 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.
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 '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
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 '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 '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!
Select plugin using focusCandidate rather than cursor
calls. This allows the detecting plugin objects that
have received focus but don't have the cursor ring
on them.
Remove 'inval rect' from debugging printfs, since it
happens a lot, and allow 'request keyboard' to be
visible.
TokenWatcher.acquire() synchronizes on mTokens, not this,
so we need to synchronize on mKeyguardDisabled in disableKeyguard()
to synchronize properly with reenableKeyguard().
This should fix b/2180142 (Stuck in enable keyguard when receiving phone call)
Change-Id: Iad66a2748c7fbf2c516fdb8a00988696719ea80c
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '6dc3f4e553d333b9f115a222a9a684bb2aa55b5e' into eclair-mr2
* commit '6dc3f4e553d333b9f115a222a9a684bb2aa55b5e':
Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such.
Merge commit 'ee110be02256b816ac6d863e39cb8b11b8071baa' into eclair-mr2
* commit 'ee110be02256b816ac6d863e39cb8b11b8071baa':
Fix issue #2179891: Need to update 5.xml
The dock app is forcing the screen to a particular brightness level. This
causes the window manager to often call into the power manager with the
new brightness. This causes us to go in to updateLightsLocked() to figure
out and apply the real brightness to use. When the screen is off the
real brightness always remains 0, but even if it didn't change from the
last one we would start an animation which would when done put the system
to sleep and fight with the user trying to turn the device on.
Now, if the new target brightness is the same as the last one, we leave the
animation as-is -- either running or not as appropriate.
Change-Id: I067d55ea2b39e294c5d5291587a4d8727c0b8083
The ViewRoot is responsible for calculating the current view's surface's
transparent region and reporting this to the window server, which in
turn notifies Surface Flinger.
To minimize cross-process traffic, ViewRoot keeps track of the
most recent transparent region that it has reported to the window
server, and only sends updates when the region shape changes.
ViewRoot is effectively shadowing the internal state of the window
server, and usually this works fine, because ViewRoot is usually the
only thing that changes this value.
But when the surface is recreated, the window server resets the
transparent region to empty. So in order to properly update the window
server we need to reset our copy of its state to empty too.
Fixes issue #2133090: GL Gears runs at half speed in some cases
Merge commit 'c08efb2712fbcc25ce9c208f3c9d7c0935e209d4' into eclair-mr2
* commit 'c08efb2712fbcc25ce9c208f3c9d7c0935e209d4':
Import revised translations. DO NOT MERGE
