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 '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 '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.
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.
Merge commit 'dfb7bc8c87d8fe694164038cf292c9913fae9bdb' into eclair-plus-aosp
* commit 'dfb7bc8c87d8fe694164038cf292c9913fae9bdb':
Make removeOnAccountsUpdateListener cope with null handlers.
Merge commit '531e580ab160864e4152f431eaeb965676c58d19' into eclair-plus-aosp
* commit '531e580ab160864e4152f431eaeb965676c58d19':
remove the incorrectly located nickname
Merge commit 'f4a36e86bb4d1e15652dfd28236150c7f917866e' into eclair-plus-aosp
* commit 'f4a36e86bb4d1e15652dfd28236150c7f917866e':
Not all WebView's host have permission to read the history.
Merge commit 'f18c539344655c8d39e3412a0985f7e42193eb52' into eclair-plus-aosp
* commit 'f18c539344655c8d39e3412a0985f7e42193eb52':
set the selection after sending a click
Webkit expects the currently focused text input to have
a set selection before it can receive key events for insertion.
Coincidentally, we always set the selection except when
using the 'next' button on the IME to switch between text fields.
The selection has to be set after the text field receives
focus, so add a setSelection() message after the click() message
is sent in passToJavaScript().
fixes http://b/issue?id=2087546
Merge commit 'f2bed60bd4921bf71a9cf05b46f000f1cdb20af8' into eclair-plus-aosp
* commit 'f2bed60bd4921bf71a9cf05b46f000f1cdb20af8':
Add final to appropriate variables.
Merge commit '43f9920271848c0ec84a958bfa06542c8fb7e4fa' into eclair-plus-aosp
* commit '43f9920271848c0ec84a958bfa06542c8fb7e4fa':
ResultTransport needs a default value. If the thread is
* changes:
ResultTransport needs a default value. If the thread is ununlocked by something else other than CallbackProxy's notify(), it can have a null value.
Merge commit 'bfe1297b12b1a81203dbd42ebbca7ff1916f1db7' into eclair-plus-aosp
* commit 'bfe1297b12b1a81203dbd42ebbca7ff1916f1db7':
Add call log support to pim.vcard.VCardComposer
Merge commit 'bb6aba1984bfdceaec43054ef0b2a8e5dcd26215' into eclair-plus-aosp
* commit 'bb6aba1984bfdceaec43054ef0b2a8e5dcd26215':
Restrict touch to the view height with the title. This
