Merge commit '40906ea24eceed5b06be2087d8e06738fc9cd876' into eclair-plus-aosp
* commit '40906ea24eceed5b06be2087d8e06738fc9cd876':
b/2154576 Fixed the problem were some BT profiles were not connected when first UUID notification of many didn't have all the UUIDs
Merge commit '7bf9e0317cfb62b12e99ed9ab6c6975c848c519e' into eclair-plus-aosp
* commit '7bf9e0317cfb62b12e99ed9ab6c6975c848c519e':
Don't auto-connect to OPP after pairing
Merge commit 'ee52bed514cbee1fade95a9f862e238c4975cd8b' into eclair-plus-aosp
* commit 'ee52bed514cbee1fade95a9f862e238c4975cd8b':
Use a custom system icon for native processes.
Merge commit 'e6531e253bf646324d3a68de0e9cc612c5e1c8ac' into eclair-plus-aosp
* commit 'e6531e253bf646324d3a68de0e9cc612c5e1c8ac':
b/2154978 Show only connectable profiles (Headset and& A2DP but not OPP) in Bluetooth Device Advance Options aka "Connect to..."
Reset connect timer event if profile was non-empty.
Clear profiles after unpair
mConnectAttemptedWithoutUuid
Change-Id: I5eab1270a755c6c87eb5be13a2f43dbbcd9a2f88
A new field is going to be added to the APN editor.
Authentication type: 4 possible values - None, PAP, CHAP, PAP or CHAP
These strings are too technical for the end user, however these
fields will be pre-populated and the user would not have to change them.
Change-Id: I7df326722fc4aebfe68d2726e2695eda8ea798a9
Handle the back key.
Finish the activity if dialog is cancelled.
Show an error and finish the activity if URL couldn't be found due to
connectivity problem and not just when Telephony is not available.
Merge commit 'e3b59f193e0df1a2643c367f7f1f4f7b6817a5f8' into eclair-plus-aosp
* commit 'e3b59f193e0df1a2643c367f7f1f4f7b6817a5f8':
b/2154576 Fixed the problem were some BT profiles were not connected when first UUID notification of many didn't have all the UUIDs
Reset connect timer event if profile was non-empty.
Clear profiles after unpair
mConnectAttemptedWithoutUuid
Change-Id: I5eab1270a755c6c87eb5be13a2f43dbbcd9a2f88
Merge commit '8fd062e1a5c0047deff1dd817a097b94891000f2' into eclair-plus-aosp
* commit '8fd062e1a5c0047deff1dd817a097b94891000f2':
Use the new VpnType.getDescriptionId().
* resume credential storage settings in onResume() in case if a new
activity changes the settings and switches back.
* reset mRetry in case the dialog is retried and canceled.
* update preferences in onDismiss handler in case the dialog is canceled
and need to revert the checkbox.
Merge commit 'be699645dbae746c431caf9c0736938c55fda588' into eclair-plus-aosp
* commit 'be699645dbae746c431caf9c0736938c55fda588':
Fix for 2137900: Be more conservative about poking the wakelock
Merge commit 'd7705d4cd710ad93954acbffa464f9c96bf33809' into eclair-plus-aosp
* commit 'd7705d4cd710ad93954acbffa464f9c96bf33809':
Fix 2147749: Make Settings.ACTION_SOUND_SETTINGS work
Merge commit '26917f1ddd052534c4a6e1577b79570d9bbbdd10'
* commit '26917f1ddd052534c4a6e1577b79570d9bbbdd10':
b/2142065 Added Bluetooth API to allow developer to request the user's permission to enable discovery mode.
Merge commit 'b20be6e24a7b546e413a00c51f8079fa7233651b'
* commit 'b20be6e24a7b546e413a00c51f8079fa7233651b':
Rename empty view so that the standard list view implementation
Merge commit 'e1089ad33896f4fe5b75e773813367d700773b6f' into eclair-plus-aosp
* commit 'e1089ad33896f4fe5b75e773813367d700773b6f':
b/2142065 Added Bluetooth API to allow developer to request the user's permission to enable discovery mode.
