| a3363ef2cdf27e8d652297e9b916d085c5550a28 |
|
14-Jan-2011 |
Jaikumar Ganesh <jaikumar@google.com> |
Do Not Merge: Expose insecure rfcomm Bluetooth API.
This complements the secure rfcomm API.
The link key is unauthenticated and is subject to MITM attacks.
The link key may be encrypted depending on the type of Bluetooth device.
This helps apps which don't need the extra security or
have their own security layer built on top of the rfcomm link.
Bug: 3352266
Change-Id: I633fd0372e5e23288d6fec950dd1abc2896031f1
/frameworks/base/core/java/android/bluetooth/BluetoothAdapter.java
|
| f51eadaf1f83abfe16a609a4ded6d789494689b2 |
|
21-Sep-2010 |
Jake Hamby <jhamby@google.com> |
Typo fixes in comments and minor code cleanups.
* Fix some typos in Javadoc and log messages.
* Remove redundant initializer in BluetoothAdapter.readOutOfBandData()
* Use canonical "UTF-8" charset name instead of "UTF8" in
BluetoothDevice.convertPinToBytes()
Change-Id: I58cd5dc48a7ad0053d204c5f590b4b3d438d8672
/frameworks/base/core/java/android/bluetooth/BluetoothAdapter.java
|
| 0f5843069bd419fba4fb253986645dfbca0784b7 |
|
17-Sep-2010 |
Jake Hamby <jhamby@google.com> |
Fix Bluetooth Javadoc to clarify the maximum device name length.
The maximum length of a Bluetooth device name is 248 bytes using
UTF-8 encoding. Updated the Javadoc to clarify that the length is
limited by the number of UTF-8 bytes and not the number of characters.
Change-Id: I135671f5ee6c5eb6372f3fbbc5fccb02de65e6c4
/frameworks/base/core/java/android/bluetooth/BluetoothAdapter.java
|
| cc5494c9996f809e36539b24e8b6b67683383d29 |
|
10-Sep-2010 |
Jaikumar Ganesh <jaikumar@google.com> |
Out Of Band API for Secure Simple Pairing.
Change-Id: I54ded27ab85d46eef3d2cca84f2394b1ffe88ced
/frameworks/base/core/java/android/bluetooth/BluetoothAdapter.java
|
| fec86f4aa2de9c89d6c0aea6128be77eb67417d1 |
|
10-Aug-2010 |
Jaikumar Ganesh <jaikumar@google.com> |
Update javadoc for the API and change return of getBondedDevices().
getBondedDevices() *might* work if called before the Bluetooth
State intent is broadcasted. However, this can cause ANRs and problems.
This API was updated to return null, if called before the intent
is received. However, this might cause existing apps to crash. Return
an empty set instead.
Change-Id: Ibc484d3394aa0bbebd651221efde6a7015ce7110
/frameworks/base/core/java/android/bluetooth/BluetoothAdapter.java
|
| f5ff170be1f6b28758f125e50524f43f9d6ec684 |
|
07-Aug-2010 |
Jaikumar Ganesh <jaikumar@google.com> |
Check whether Bluetooth is enabled before making any API calls.
For example, Settings app makes calls to get Bonded Devices
before Bluetooth is on. This leads to ANRs and will
prevent autoconnection.
Change-Id: I56748a9bd1d603b5782c17775c6b20b831bf6572
/frameworks/base/core/java/android/bluetooth/BluetoothAdapter.java
|
| af21fa61c2158fa2a693d98bb281abd56e658b40 |
|
18-May-2010 |
Jaikumar Ganesh <jaikumar@google.com> |
Removing STOPSHIP logs.
Bug: 2694602
Change-Id: Id56e1ddcf5ea76de32238cd6761f2caf053f1fa1
/frameworks/base/core/java/android/bluetooth/BluetoothAdapter.java
|
| 7b0463a949b57620680b95e45c66a05f67426b74 |
|
11-Dec-2009 |
Scott Main <smain@google.com> |
am ed2a70d6: docs: add the Bluetooth developer guide, and make some revisions to the BT javadocs
Merge commit 'ed2a70d6495b3f1928e36ad2b00ee4d33b2c0379' into eclair-mr2
* commit 'ed2a70d6495b3f1928e36ad2b00ee4d33b2c0379':
docs: add the Bluetooth developer guide,
|
| ed2a70d6495b3f1928e36ad2b00ee4d33b2c0379 |
|
10-Dec-2009 |
Scott Main <smain@google.com> |
docs: add the Bluetooth developer guide,
and make some revisions to the BT javadocs
/frameworks/base/core/java/android/bluetooth/BluetoothAdapter.java
|
| cb5966426a51aeb7d02e7f859512d20e084e03ed |
|
20-Nov-2009 |
Scott Main <smain@google.com> |
am e1611399: am 6d95fc0a: docs for ESR: add docs to bluetooth explainin that discovery should be cancelled before connecting to a device
Merge commit 'e16113998bb10f39ee1384bfc497aceeeb193440' into eclair-mr2
* commit 'e16113998bb10f39ee1384bfc497aceeeb193440':
docs for ESR: add docs to bluetooth explainin that discovery should
|
| e16113998bb10f39ee1384bfc497aceeeb193440 |
|
20-Nov-2009 |
Scott Main <smain@google.com> |
am 6d95fc0a: docs for ESR: add docs to bluetooth explainin that discovery should be cancelled before connecting to a device
Merge commit '6d95fc0a2ca910212a43c4547c0ef000659b72dc' into eclair
* commit '6d95fc0a2ca910212a43c4547c0ef000659b72dc':
docs for ESR: add docs to bluetooth explainin that discovery should
|
| 6d95fc0a2ca910212a43c4547c0ef000659b72dc |
|
20-Nov-2009 |
Scott Main <smain@google.com> |
docs for ESR: add docs to bluetooth explainin that discovery should
be cancelled before connecting to a device
bug: 2160782,2198463
/frameworks/base/core/java/android/bluetooth/BluetoothAdapter.java
|
| b262f50af9ad22837af9e88e6c8f71b44cdefd56 |
|
10-Nov-2009 |
Scott Main <smain@google.com> |
am 13ce56bd: am 88427cff: Merge change Ibcfb7d10 into eclair-sdk
Merge commit '13ce56bdbc4872c0b12caff501e063f5a75073db' into eclair-mr2
* commit '13ce56bdbc4872c0b12caff501e063f5a75073db':
docs: add more documentation for the bluetooth apis.
|
| 13ce56bdbc4872c0b12caff501e063f5a75073db |
|
10-Nov-2009 |
Scott Main <smain@google.com> |
am 88427cff: Merge change Ibcfb7d10 into eclair-sdk
Merge commit '88427cff609e668185010af2244500be5823595e' into eclair
* commit '88427cff609e668185010af2244500be5823595e':
docs: add more documentation for the bluetooth apis.
|
| 9fab0aef19a4633d2e4670564e5d7ae9e52fe11f |
|
04-Nov-2009 |
Scott Main <smain@google.com> |
docs: add more documentation for the bluetooth apis.
more descriptions for some of the classes and a new
overview and pseudo-code example for using BT APIs
in the package summary.
/frameworks/base/core/java/android/bluetooth/BluetoothAdapter.java
|
| 811f655366461d0f21f970bcac07dd2084fd54fa |
|
06-Nov-2009 |
Michael Chan <mchan@android.com> |
am 8d51f710: Merge change Icdd2864e into eclair
Merge commit '8d51f7101d2427953dbff9b4b8f8c9fdc0dc4a91' into eclair-mr2
* commit '8d51f7101d2427953dbff9b4b8f8c9fdc0dc4a91':
b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
|
| cdd2864eb340fe46a97f4991f3949db1196bdde8 |
|
06-Nov-2009 |
Michael Chan <mchan@android.com> |
b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
/frameworks/base/core/java/android/bluetooth/BluetoothAdapter.java
|
| bf2efbc0642d07acee1a83c17987abb380e5243a |
|
30-Oct-2009 |
Jaikumar Ganesh <jaikumar@google.com> |
am 3cf254d2: Merge change I4b3db907 into eclair
Merge commit '3cf254d2ba303da3354ed65fd7f3136e87a56b9f' into eclair-mr2
* commit '3cf254d2ba303da3354ed65fd7f3136e87a56b9f':
Revert the channge where channels were not selected randomly.
|
| 4b3db907f04d85cd20e0a0e35056ba44a10e8867 |
|
30-Oct-2009 |
Jaikumar Ganesh <jaikumar@google.com> |
Revert the channge where channels were not selected randomly.
The Bluez SDP bug has been fixed.
Reverting parts of the commit: 16fb88a673c41b93c5d57ccb28c2697e7d87701a
Bug: 2173752
Dr No: Eastham
/frameworks/base/core/java/android/bluetooth/BluetoothAdapter.java
|
| db7ae10d6b8e86ff5311512de45afa65a1b0a738 |
|
09-Oct-2009 |
Nick Pelly <npelly@google.com> |
Remove STOPSHIP BT logging.
Do not merge.
Change-Id: I428bc0fc67030f24112f2e9c865824dfaea4897d
DrNo: eastham
Bug: 2089423
Joke: Why was Tigger looking in the toilet? To find Pooh
/frameworks/base/core/java/android/bluetooth/BluetoothAdapter.java
|
| e6ee3be1c254404dad842298f6f56c11cc6c7ac8 |
|
08-Oct-2009 |
Nick Pelly <npelly@google.com> |
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.
/frameworks/base/core/java/android/bluetooth/BluetoothAdapter.java
|
| f242b7b931898856bcbcb7ec36cacf43098ba544 |
|
08-Oct-2009 |
Nick Pelly <npelly@google.com> |
Introduce BluetoothAdapter.getDefaultAdapter().
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
/frameworks/base/core/java/android/bluetooth/BluetoothAdapter.java
|
| 16fb88a673c41b93c5d57ccb28c2697e7d87701a |
|
07-Oct-2009 |
Nick Pelly <npelly@google.com> |
Encourage developers to connect RFCOMM by UUID instead of Channel.
Hide createRfcommSocket(int channel)
Add createRfcommSocketWithServiceRecord(UUID uuid)
Rename listenUsingRfcomm(String,UUID) -> listenUsingRfcommWithServiceRecord(..)
Now we have a complete API for developers to make peer-peer RFCOMM connections
with hard-coding the limited (30) RFCOMM channels, instead using SDP lookup
of an UUID.
This commit addresses two serious bugs:
- Do not throw IOException on accepting an incoming RFCOMM connection with
BluetoothSocket. This was a regression from commit 24bb9b8af4ff6915
- Workaround failure of bluez to update SDP cache when channel changes by
trying to use the same RFCOMM channel on the server every time, instead
of picking server channels randomly. This is a pretty ugly workaround,
and we are still trying to fix the caching issue - but with this
workaround we are at least shippable and apps will work at least until
they start colliding on the 30 RFCOMM channels.
DrNo: eastham
Bug: 2158900
Joke: What did the digital watch say to his mom? "Look mom no hands."
Change-Id: Ia4879943b83afac06b6f1a3f2391cf1628afce7d
/frameworks/base/core/java/android/bluetooth/BluetoothAdapter.java
|
| 24bb9b8af4ff691538fe9e517e8156016b0da6cd |
|
03-Oct-2009 |
Nick Pelly <npelly@google.com> |
Provide an API for apps to use a dynamic RFCOMM channel and SDP record.
Hide listenUsingRfcommOn(int channel)
Add listenUsingRfcomm(String name, ParcelUuid uuid)
The new API automatically finds a free RFCOMM channel and registers an SDP
record with the given uuid and name. The SDP record is automatically
removed when the socket is closed, or if the application dies.
Apps are prevented from registering SDP records with the uuid of system
Bluetooth profiles, such as A2DP, HFP and OPP.
Apps are prevented from removing SDP records that they did not create. This is
tracked by pid.
TODO: Provide an API for the connecting app to look up an SDP record.
Bug: 2158900
DrNo: eastham
Joke: "What did the dog say to the tree? bark."
Change-Id: Ia92f51c34615a7270a403255ad2b8faa98c4a3f5
/frameworks/base/core/java/android/bluetooth/BluetoothAdapter.java
|
| aef439e6f825c0cb99a2ac08c8207f48b7a9fe10 |
|
28-Sep-2009 |
Nick Pelly <npelly@google.com> |
Move android.bluetooth.ParcelUuid to android.os.ParcelUuid
Change-Id: I564429d5c5b6a5372b6ff26a53b0d7e518b53631
/frameworks/base/core/java/android/bluetooth/BluetoothAdapter.java
|
| 1acdcc1a508c00dc31751a2a2eef539a59cb21ce |
|
28-Sep-2009 |
Nick Pelly <npelly@google.com> |
Add an API to request a system activity to turn on Bluetooth.
Change-Id: I2fca33ad27017ea4e2ecba37854b749682d07672
/frameworks/base/core/java/android/bluetooth/BluetoothAdapter.java
|
| 12835478ee687a493d1b5882e67b6725bd539c26 |
|
26-Sep-2009 |
Nick Pelly <npelly@google.com> |
Handle expiration of discovery mode in system server.
Change-Id: I58fd199b40ffdf8168a5489be8eedb5d25d56722
/frameworks/base/core/java/android/bluetooth/BluetoothAdapter.java
|
| 3219ab4de27cd40b2149b0dd13edd412efe40244 |
|
25-Sep-2009 |
Brad Fitzpatrick <bradfitz@google.com> |
Fix typo in Bluetooth docs.
/frameworks/base/core/java/android/bluetooth/BluetoothAdapter.java
|
| 18b1e79a123b979d25bfa5d0b0ee5d0382dbd64b |
|
24-Sep-2009 |
Nick Pelly <npelly@google.com> |
Bluetooth API: Do not allow apps to programmatically make BT discoverable.
Instead add ACTION_REQUEST_DISCOVERABLE for the system to show a dialog to
adjust discoverable mode.
Also remove createBond(), removeBond() and cancelBondProcess(). The Settings
App already handles these automatically when connections require bonding.
Change-Id: I216154cd1b6de410de64ba91b07d7263ac03e8df
/frameworks/base/core/java/android/bluetooth/BluetoothAdapter.java
|
| 55e66f1b739097095f6b3c47f88de258898fc1c9 |
|
18-Sep-2009 |
Nick Pelly <npelly@google.com> |
Reject lowercase characters in checkBluetoothAddress().
This keeps consistency with Bluez which uses upper case string address. It's
important to keep the case the same so that .equals() in BluetoothService.java
work.
Change-Id: I6404ca137d0aec3cc2e6e7cb79763d5305a03547
/frameworks/base/core/java/android/bluetooth/BluetoothAdapter.java
|
| 005b228cdfb369d9b3b325884c0337ba5968bf8c |
|
10-Sep-2009 |
Nick Pelly <npelly@google.com> |
API_CHANGE: Cleanup, javadoc and unhide more Bluetooth API.
This is a large batch, and covers:
-- Bluetooth Device Discovery --
BluetoothAdapter.ACTION_DISCOVERY_STARTED
BluetoothAdapter.ACTION_DISCOVERY_FINISHED
BluetoothAdapter.startDiscovery()
BluetoothAdapter.cancelDiscovery()
BluetoothAdapter.isDiscovering()
-- Bluetooth bonding (pairing) --
BluetoothAdapter.getBondedDevices()
BluetoothDevice.ACTION_BOND_STATE_CHANGED
BluetoothDevice.EXTRA_BOND_STATE
BluetoothDevice.EXTRA_PREVIOUS_BOND_STATE
BluetoothDevice.BOND_NONE
BluetoothDevice.BOND_BONDING
BluetoothDevice.BOND_BONDED
BluetoothDevice.getBondState()
BluetoothDevice.createBond()
BluetoothDevice.cancelBondProcess()
BluetoothDevice.removeBond()
-- BluetoothClass --
BluetoothDevice.ACTION_CLASS_CHANGED
BluetoothDevice.EXTRA_CLASS
BluetoothDevice.getBluetoothClass()
BluetoothClass.Service.*
BluetoothClass.Device.Major.*
BluetoothClass.Device.*
BluetoothClass.getDeviceClass()
BluetoothClass.getMajorDeviceClass()
BluetoothClass.hasService()
-- Misc BluetoothDevice --
BluetoothDevice.ACTION_ACL_CONNECTED
BluetoothDevice.ACTION_ACL_DISCONNECTED_REQUESTED
BluetoothDevice.ACTION_ACL_DISCONNECTED
BluetoothDevice.ACTION_DISCOVERED
BluetoothDevice.ACTION_NAME_CHANGED
BluetoothDevice.EXTRA_DEVICE
BluetoothDevice.EXTRA_NAME
BluetoothDevice.EXTRA_RSSI
-- Misc BluetoothAdapter --
BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED
BluetoothAdapter.EXTRA_LOCAL_NAME
BluetoothAdapter.checkBluetoothAddress()
I deprecated BluetoothIntent and moved each intent into the class it relates
to.
Change-Id: I877b1280428ab46278b2bc25668bb44cda22dc36
/frameworks/base/core/java/android/bluetooth/BluetoothAdapter.java
|
| b24e11baac589fe16426f2d243b460ab84991c7b |
|
09-Sep-2009 |
Nick Pelly <npelly@google.com> |
API_CHANGE
Deprecate BluetoothError.java.
I spent a lot of time experimenting with a class BluetoothError to enumerate
the many error codes returned by the Bluetooth API. But at the end of the day
they were never used. The vast majority of method calls only really need a
true/false error value, and often not even that.
Methods which do need more detailed error enumeration (for example, bonding
failures) can have there own enumerated error codes. But there is no need
for a common set of error codes.
Also change the IPC failed warnings in BluetoothA2dp to Log.e. These indicate
a very serious error.
Introduce BluetoothAdapter.ERROR and BluetoothDevice.ERROR as helper sentinel
values.
/frameworks/base/core/java/android/bluetooth/BluetoothAdapter.java
|
| de893f550301a60274e87aa8168225e7a7a42184 |
|
08-Sep-2009 |
Nick Pelly <npelly@google.com> |
API_CHANGE
Another round of Bluetooth API clean up, javadoc'ing and unhide'ing.
-- Symbols for getting/setting bluetooth state --
BluetoothAdapter.ACTION_STATE_CHANGED
BluetoothAdapter.EXTRA_STATE
BluetoothAdapter.EXTRA_PREVIOUS_STATE
BluetoothAdapter.STATE_OFF
BluetoothAdapter.STATE_TURNING_ON
BluetoothAdapter.STATE_ON
BluetoothAdapter.STATE_TURNING_OFF
BluetoothAdapter.isEnabled()
BluetoothAdapter.getState()
BluetoothAdapter.enable()
BluetoothAdapter.disable()
-- Symbols for getting/setting scan mode --
BluetoothAdapter.ACTION_SCAN_MODE_CHANGED
BluetoothAdapter.EXTRA_SCAN_MODE
BluetoothAdapter.EXTRA_PREVIOUS_SCAN_MODE
BluetoothAdapter.SCAN_MODE_NONE
BluetoothAdapter.SCAN_MODE_CONNECTABLE
BluetoothAdapter.SCAN_MODE_DISCOVERABLE
BluetoothAdapter.getScanMode()
BluetoothAdapter.setScanMode()
-- Symbols for getting address/names --
BluetoothAdapter.getAddress()
BluetoothAdapter.getName()
BluetoothAdapter.setName()
/frameworks/base/core/java/android/bluetooth/BluetoothAdapter.java
|
| cf44059813539bf7f36dabd278cef93ba3122c56 |
|
08-Sep-2009 |
Nick Pelly <npelly@google.com> |
Add javadoc to explain which permissions are required for Public BT API's.
/frameworks/base/core/java/android/bluetooth/BluetoothAdapter.java
|
| 71c3c7806acb2b2b7b8441817c26a2101d447bbe |
|
02-Sep-2009 |
Nick Pelly <npelly@google.com> |
Immediately destroy BluetoothSocket's on close().
Unfortunatley, shutdown() on the underlying fd does not actually stop a
listening socket from listening. You need to call close() on the fd to
do this. There is no way around it.
So this means the Java BluetoothSocket code has to call destroyNative() during
BluetoothSocket.close().
Since native methods cannot be called after destroyNative(), add a ReadWrite
lock and mClosed field to protect access to native methods.
This fixes the "resource busy" error when Bluetooth OPP and Bluetooth PBAP
tried to resume listening after turning BT off and then on.
/frameworks/base/core/java/android/bluetooth/BluetoothAdapter.java
|
| 45e2704ff512d41e22af2801d76e96955469ce8d |
|
19-Aug-2009 |
Nick Pelly <npelly@google.com> |
API CHANGE
Javadoc, and unhide the first pieces of the Bluetooth API.
With this commit there is enough public API to connect and use an RFCOMM
connection between Bluetooth devices.
/frameworks/base/core/java/android/bluetooth/BluetoothAdapter.java
|
| bd022f423a33f0794bb53e5b0720da2d67e4631c |
|
15-Aug-2009 |
Nick Pelly <npelly@google.com> |
Bluetooth: API change.
Split BluetoothDevice into BluetoothDevice and BluetoothAdapter.
BluetoothAdapter: Represents the local BT adapter. Operations on the local
adapter (start a scan, etc).
BluetoothDevice: Represents a remote BT device. Operations on remote devices
(pair, connect, etc).
IBluetoothDevice.aidl -> Bluetooth.aidl
BluetoothDeviceService.java -> BluetoothDeviceService.java
TODO:
Javadoc
/frameworks/base/core/java/android/bluetooth/BluetoothAdapter.java
|