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 '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.
Merge commit '5a201b787233a7e2b9b4bf6f84ab14b2cd3eec74' into eclair-plus-aosp
* commit '5a201b787233a7e2b9b4bf6f84ab14b2cd3eec74':
Rename empty view so that the standard list view implementation
* changes:
Rename empty view so that the standard list view implementation displays empty list message when list goes empty. Ideally the list is not empty for running processes and All filter options. so the message is just set to third party apps Remove the empty list view logic from code base
Merge commit '5928da682a31f3375a206d551c478d76437bb7cf' into eclair-plus-aosp
* commit '5928da682a31f3375a206d551c478d76437bb7cf':
Fix power widget brightness for Sholes.
displays empty list message when list goes empty. Ideally the list is
not empty for running processes and All filter options. so the
message is just set to third party apps
Remove the empty list view logic from code base
Merge commit 'afa9d6ea321228add087f753e1e2a3853150d56f' into eclair-plus-aosp
* commit 'afa9d6ea321228add087f753e1e2a3853150d56f':
Display cell location for CDMA in Phone info screen.
Merge commit 'a38a1a77ab36e6779790401c3a02604e428ac58b' into eclair-plus-aosp
* commit 'a38a1a77ab36e6779790401c3a02604e428ac58b':
b/2137747 Fixed the problem where BT is stuck grayed out if you turned off BT, turned on Airplane mode, turn off then on screen, turned off Airplane mode.
* changes:
b/2137747 Fixed the problem where BT is stuck grayed out if you turned off BT, turned on Airplane mode, turn off then on screen, turned off Airplane mode.
Merge commit 'a40fb23734cc5d5ac6e69a060cbb488269ad8af3' into eclair-plus-aosp
* commit 'a40fb23734cc5d5ac6e69a060cbb488269ad8af3':
Add Safety information to Settings > About Phone
The Safety information link is stored in a system property, ro.url.safetylegal
If the phone has data connection, select "Safety information" menu will open the
Safety information link. If there is no data connection for the phone, a message will
pop up which ask user to open Safety information link from PC.
Change-Id: Ia46e2e868ebcda93138cb9f00c978d8ac827022a
