Merge commit 'e6ee3be1c254404dad842298f6f56c11cc6c7ac8' into eclair-plus-aosp
* commit 'e6ee3be1c254404dad842298f6f56c11cc6c7ac8':
BT API security audit: fix a couple of permission mistakes.
Make functions that are meant to be BLUETOOTH_ADMIN really
BLUETOOTH_ADMIN.
Add some missing javadoc for permissions.
The only functional change here is the BLUETOOTH->BLUETOOTH_ADMIN
changes. This is super safe because every system app that uses BT
has both permissions.
Change-Id: Iddc61f9fd5d81fe0171358665a0fa52f2fa02871
DrNo: eastham
Joke: How do you catch a rabbit? Hide behind a tree and make carrott noises.
Merge commit '348b92bd513087369ac682e29620d7829fa1381b' into eclair-plus-aosp
* commit '348b92bd513087369ac682e29620d7829fa1381b':
GPS: Fix problem with SUPL when SUPL APN is already active.
Merge commit 'ff94720b8bf9f83f326197cb0cb27576168e9448' into eclair-plus-aosp
* commit 'ff94720b8bf9f83f326197cb0cb27576168e9448':
Fix issue 2174002: After rejecting Call when device ringtone is mute and playing music, audio is not transfered to BT device.
Use ConnectivityManager.CONNECTIVITY_ACTION broadcast in LocationManagerService
to notify GPS when SUPL connection is ready instead of TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED,
which is not sent in all cases.
Expand LocationProvider.updateNetworkState() to include NetworkInfo object.
Fixes bug b/2155661
Change-Id: Iee227ace7d536b36cf7973e3e6a8b7a621ce6565
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '9d5b58991ef90e91b3c942c80ae3502ed62d10aa' into eclair-plus-aosp
* commit '9d5b58991ef90e91b3c942c80ae3502ed62d10aa':
Set the Bond State to NONE when we receive a Agent Cancel.
Added a workarouond to request the A2DP output standby directly to audio hardware when the sink is suspended as it seems that the suspend request often fails.
Also take into account resume requests received while a suspend request is pending.
Merge commit '3b36ed09293965e7e5dc20dfa514422388e796d6' into eclair-plus-aosp
* commit '3b36ed09293965e7e5dc20dfa514422388e796d6':
Fixes#2175599. Prevents an NPE when AttachInfo is null.
Sometimes during OPP, we can get stuck in Pairing state when the remote
end, cancels the Pairing process - we will just get onAgentCancel
and thus not set the Pairing state properly.
DrNo: Eastham
Bug:2174874
Merge commit 'f81ecc1fb7cad523b62c7f2662f4aab3ea0dee54' into eclair-mr2
* commit 'f81ecc1fb7cad523b62c7f2662f4aab3ea0dee54':
Only dismiss search dialog after launching intent.
Merge commit 'f81ecc1fb7cad523b62c7f2662f4aab3ea0dee54' into eclair-plus-aosp
* commit 'f81ecc1fb7cad523b62c7f2662f4aab3ea0dee54':
Only dismiss search dialog after launching intent.
Merge commit '8bd04b2000f418c8c6f4f628abc215bb5a688244' into eclair-plus-aosp
* commit '8bd04b2000f418c8c6f4f628abc215bb5a688244':
fix an NPE on a race condition that occurs when unbinding from an authenticator at the samer time that its process dies: bug 2171204
Merge commit '8bd04b2000f418c8c6f4f628abc215bb5a688244' into eclair-mr2
* commit '8bd04b2000f418c8c6f4f628abc215bb5a688244':
fix an NPE on a race condition that occurs when unbinding from an authenticator at the samer time that its process dies: bug 2171204
Merge commit 'b134b2038ecabcbec3f9b657834d45de27707068' into eclair-plus-aosp
* commit 'b134b2038ecabcbec3f9b657834d45de27707068':
More fix#2163209: alarm clock rings but is hidden behind lock screen
Merge commit 'b134b2038ecabcbec3f9b657834d45de27707068' into eclair-mr2
* commit 'b134b2038ecabcbec3f9b657834d45de27707068':
More fix#2163209: alarm clock rings but is hidden behind lock screen
There was another way we could ignore the application windows flags
while the lock screen was displayed. This is the infrastructure to
deal with that.
Change-Id: Id8c9cb2f7081df6757ccb797a7cde618e82f7b38
Merge commit '568cae571a3d74d1992176a21722e07b44e9a3c4' into eclair-mr2
* commit '568cae571a3d74d1992176a21722e07b44e9a3c4':
Fix issue #2171460: Turn off background blurring of power dialog
Merge commit '568cae571a3d74d1992176a21722e07b44e9a3c4' into eclair-plus-aosp
* commit '568cae571a3d74d1992176a21722e07b44e9a3c4':
Fix issue #2171460: Turn off background blurring of power dialog
This is the main entry point to the Bluetooth APIs, and returns the default
local Bluetooth adapter.
It replaces context.getSystemService(Context.BLUETOOTH_SERVICE). This was
never in a public SDK release.
DrNo: eastham
Bug: 2158765
Joke: Why can't you play cards in the jungle? Because there's too many cheetas!
Change-Id: Ieed8be009ee5aba621cb69090ee8c8a9c19c840d
Merge commit 'dc2ccb82f96b6a7be7a7b262b81d3aa1422f46fa' into eclair-plus-aosp
* commit 'dc2ccb82f96b6a7be7a7b262b81d3aa1422f46fa':
Encourage developers to connect RFCOMM by UUID instead of Channel.
Merge commit 'dc2ccb82f96b6a7be7a7b262b81d3aa1422f46fa' into eclair-mr2
* commit 'dc2ccb82f96b6a7be7a7b262b81d3aa1422f46fa':
Encourage developers to connect RFCOMM by UUID instead of Channel.
