Merge commit '6e6d2362ccd119e51839a4f306c26783f634ab15' into eclair-plus-aosp
* commit '6e6d2362ccd119e51839a4f306c26783f634ab15':
Check if a device is added to the cache before returning.
Merge commit '9767612cc8207f906173dc9459b45cd07d881c4e' into eclair-plus-aosp
* commit '9767612cc8207f906173dc9459b45cd07d881c4e':
SecuritySettings: fix a the status before handling the intent.
Merge commit 'e61a2403a64bd711dcf3abb36594eb6545601c80' into eclair-plus-aosp
* commit 'e61a2403a64bd711dcf3abb36594eb6545601c80':
SecuritySettings: set the check box before further processing.
Merge commit 'd2fa30baee10b755704beded16e8cf0ab2eb502f' into eclair-plus-aosp
* commit 'd2fa30baee10b755704beded16e8cf0ab2eb502f':
WifiSettings: use keystore namespace instead of blobl.
For incoming connections, we don't have the device in the Settings cache.
After we tried to readPairedDevices, check if we added to the cache.
If we successfully added it, continue with the connections, else bail out.
Bug id: 2160617
Change-Id: I25f2afba8ef6d2c32a7940f967cf12f1321ad9e0
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
