Merge commit '36b10bf525ed6d9819e696509530f19fb3d15275'
* commit '36b10bf525ed6d9819e696509530f19fb3d15275':
DO NOT MERGE: Copy 4.xml to 5.xml to allow Eclair to diverge from Donut.
Merge commit 'f73afeeec3d4c841207ffc4e5415b8fe4555a5a1'
* commit 'f73afeeec3d4c841207ffc4e5415b8fe4555a5a1':
fix the logic for starting a sync after the accounts changed
Merge commit 'd5b16418ed7dcdeeba108bad0e4c78ef25ded52c'
* commit 'd5b16418ed7dcdeeba108bad0e4c78ef25ded52c':
- make an AccountManager per context, not one per process
Merge commit '296e7b951914f983b4d063da02d38162ac01abd0'
* commit '296e7b951914f983b4d063da02d38162ac01abd0':
Add a new IResourceValue that knows about the density.
Merge commit '648297ff5d1a56f08985d26d58f1471e2ff0ba86'
* commit '648297ff5d1a56f08985d26d58f1471e2ff0ba86':
Dock screen on config can now select AC or USB.
Merge commit '2b0d6e7e43f92b1fb1dea207b3eb4121369594c3'
* commit '2b0d6e7e43f92b1fb1dea207b3eb4121369594c3':
Add support for thumbnails to WallpaperInfo.
Merge commit '7ca38352b911bfd299f5862da930e388eba7f903'
* commit '7ca38352b911bfd299f5862da930e388eba7f903':
Setting the default HTTP user agent at runtime init.
* We now check for in-progress backups when asked to perform one, and don't
bother firing off another one concurrently (nor do we adjust the scheduling;
after all, someone asked to do a backup "now" and we're doing one, so we are
in line with expectations). We also defer backup passes while a restore is
in flight, and abort attempts to perform a restore during a backup pass.
* When a backup attempt fails, we now ask the transport how far in the future we
should put our retry. Previously we were simply not bothering to consult with
the transport, so we would wind up retrying backup while network connectivity
was known to be down, etc.
Change-Id: Ic7758010b74e06e90c50d46b7b0dd01b17af7c90
Merge commit '1a42cfac152faa98c2e3d9e9fd6889209de195fe' into eclair-plus-aosp
* commit '1a42cfac152faa98c2e3d9e9fd6889209de195fe':
Use LM_SECURE when auth && encrypt.
Merge commit '18b1e79a123b979d25bfa5d0b0ee5d0382dbd64b' into eclair-plus-aosp
* commit '18b1e79a123b979d25bfa5d0b0ee5d0382dbd64b':
Bluetooth API: Do not allow apps to programmatically make BT discoverable.
Instead add ACTION_REQUEST_DISCOVERABLE for the system to show a dialog to
adjust discoverable mode.
Also remove createBond(), removeBond() and cancelBondProcess(). The Settings
App already handles these automatically when connections require bonding.
Change-Id: I216154cd1b6de410de64ba91b07d7263ac03e8df
Merge commit 'cc89ef3d6e9b1f9be657c9158ad04b8de104434c' into eclair-plus-aosp
* commit 'cc89ef3d6e9b1f9be657c9158ad04b8de104434c':
Implement pause/resume for the RS thread.
Merge commit '0665ae22aa51183d6ff5fdd0abeee0344306e89d' into eclair-plus-aosp
* commit '0665ae22aa51183d6ff5fdd0abeee0344306e89d':
Fix 2101425: Camera crashes spontaneously in preview.
Merge commit '0808c961264cd4a9961ac4cb167208d7b1d14dbb' into eclair-plus-aosp
* commit '0808c961264cd4a9961ac4cb167208d7b1d14dbb':
Update layouts to show status (battery, alarm) info on pattern unlock screen. make buttons dark.
Merge commit '7d0bdfaf9adbdaee0b8979d3d23b5b7ecb8a90a9' into eclair-plus-aosp
* commit '7d0bdfaf9adbdaee0b8979d3d23b5b7ecb8a90a9':
Suppress the testPing as we moved the release test target to the userdebug. This test rely on a mock_media_player.so which build under the eng build
* changes:
Suppress the testPing as we moved the release test target to the userdebug. This test rely on a mock_media_player.so which build under the eng build
Merge commit '4579ed287a0f6fc32fbfefdd5c7cf69491fdae99' into eclair-plus-aosp
* commit '4579ed287a0f6fc32fbfefdd5c7cf69491fdae99':
Add "TYPE=" to type attribute when appropriate.
Merge commit 'd35db5ec8bd5ef07840fa84318284df04a69411c' into eclair-plus-aosp
* commit 'd35db5ec8bd5ef07840fa84318284df04a69411c':
Fix bug#2144742: guard against 0 length encoded string when attaching a 'from' address for MMS.
Merge commit '0d3999f788eb01baa8ba671878387761cbbbf861' into eclair-plus-aosp
* commit '0d3999f788eb01baa8ba671878387761cbbbf861':
Minor cleanup of profile and compile logging.
The problem is we missed an "obj" parameter while calling
postEventFromNative (which put it in a field of a Message object),
so a garbage value on stack is used.
When the GC tries to follow that "obj" field, expecting to find
another object, it crashes.
