diff options
author | Jaikumar Ganesh <jaikumar@google.com> | 2011-06-21 11:23:51 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-21 11:23:51 -0700 |
commit | b38fa2a0ac2bde56504929de6a3dd61ac723958e (patch) | |
tree | 321388d9d08b1a6645239c6210e2c8ca4e66b67a /core/java/android/server/BluetoothA2dpService.java | |
parent | 17523abb45b7f77f35af53e895d74be13f2314e0 (diff) | |
parent | d762f063be970033314d3f77194bfe5cb284b605 (diff) | |
download | frameworks_base-b38fa2a0ac2bde56504929de6a3dd61ac723958e.zip frameworks_base-b38fa2a0ac2bde56504929de6a3dd61ac723958e.tar.gz frameworks_base-b38fa2a0ac2bde56504929de6a3dd61ac723958e.tar.bz2 |
Merge "DO NOT MERGE Incoming Bluetooth Connection requests - dialog." into gingerbread
Diffstat (limited to 'core/java/android/server/BluetoothA2dpService.java')
-rw-r--r-- | core/java/android/server/BluetoothA2dpService.java | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/core/java/android/server/BluetoothA2dpService.java b/core/java/android/server/BluetoothA2dpService.java index 6e221c8..bea01f3 100644 --- a/core/java/android/server/BluetoothA2dpService.java +++ b/core/java/android/server/BluetoothA2dpService.java @@ -457,6 +457,22 @@ public class BluetoothA2dpService extends IBluetoothA2dp.Stub { Settings.Secure.getBluetoothA2dpSinkPriorityKey(device.getAddress()), priority); } + public synchronized boolean allowIncomingConnect(BluetoothDevice device, boolean value) { + mContext.enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, + "Need BLUETOOTH_ADMIN permission"); + String address = device.getAddress(); + if (!BluetoothAdapter.checkBluetoothAddress(address)) { + return false; + } + Integer data = mBluetoothService.getAuthorizationAgentRequestData(address); + if (data == null) { + Log.w(TAG, "allowIncomingConnect(" + device + ") called but no native data available"); + return false; + } + log("allowIncomingConnect: A2DP: " + device + ":" + value); + return mBluetoothService.setAuthorizationNative(address, value, data.intValue()); + } + private synchronized void onSinkPropertyChanged(String path, String []propValues) { if (!mBluetoothService.isEnabled()) { return; |