Commit Graph

142 Commits

Author SHA1 Message Date
Michael Chan
41eb38412a am 0c75b2d2: Merge change I80790bdb into eclair
Merge commit '0c75b2d2dc35b88d5cb9db96afc72ed074ca5350' into eclair-mr2

* commit '0c75b2d2dc35b88d5cb9db96afc72ed074ca5350':
  b/2296110 Dialog for setting up dock audio.
2009-12-07 20:50:32 -08:00
Android (Google) Code Review
0c75b2d2dc Merge change I80790bdb into eclair
* changes:
  b/2296110 Dialog for setting up dock audio.
2009-12-07 20:48:16 -08:00
Michael Chan
df9504ef58 b/2296110 Dialog for setting up dock audio.
Reimplemented as a Foreground Service just so it can get on top of the Car Dock App.
Added debounce mechanism to not disconnect immediately after getting a undock event.
Each dock now has its own "Remember setting".
Remember Settings is on by default

Change-Id: I80790bdb7c831e2a642365b92433012191aa70c1
2009-12-07 16:57:26 -08:00
Jaikumar Ganesh
e509c36f1e am 55dc6cb9: Disconnect even Sinks in Connecting state while connecting another sink.
Merge commit '55dc6cb99db1f9f6677dfec5a25a34e933807be5' into eclair-mr2

* commit '55dc6cb99db1f9f6677dfec5a25a34e933807be5':
  Disconnect even Sinks in Connecting state while connecting another sink.
2009-12-07 15:52:53 -08:00
Jaikumar Ganesh
55dc6cb99d Disconnect even Sinks in Connecting state while connecting another sink.
We can hit this more when using a Car Dock

Bug: 2133530
Dr No: Eastham
2009-12-07 15:22:50 -08:00
Michael Chan
2ffa95fd59 am 0bd445b9: b/2296110 New Dialog which appears when phone is place on dock.
Merge commit '0bd445b974292dc3910b6bb85dcee7e7c378968f' into eclair-mr2

* commit '0bd445b974292dc3910b6bb85dcee7e7c378968f':
  b/2296110 New Dialog which appears when phone is place on dock.
2009-12-03 20:44:45 -08:00
Michael Chan
0bd445b974 b/2296110 New Dialog which appears when phone is place on dock.
Change-Id: I58b216ee9b4ca9ce16210309358c0512271e128e
2009-12-03 20:32:38 -08:00
Michael Chan
87985ae6de am 3327f788: b/2293042 Fixed the problem where A2DP connections may fail if there\'s an existing connection to another device.
Merge commit '3327f7887328c55ef2d837a8e2a07cea2070c744' into eclair-mr2

* commit '3327f7887328c55ef2d837a8e2a07cea2070c744':
  b/2293042 Fixed the problem where A2DP connections may fail if there's an existing connection to another device.
2009-12-03 12:23:17 -08:00
Michael Chan
3327f78873 b/2293042 Fixed the problem where A2DP connections may fail if there's an existing connection to another device.
Change-Id: I1b4963a167b633c0905e2719ab3f651ff8be9f2c
2009-12-03 11:45:59 -08:00
Jaikumar Ganesh
9a1ed7e4e6 Update to reflect new priorities for A2DP profile. DO NOT MERGE.
1. PRIORITY_OFF is when it is unchecked.
2. PRIORITY_ON is when it is checked.
3. PRIORITY_AUTO_CONNECT is when we want to auto connect.

When the box is checked, we want to auto connect,
so set the priority to AUTO_CONNECT.
When the user disconnects, we set the priority back
to PRIORITY_ON.

Change priority for Headset profile on the same lines as A2DP profile.

AUTO_CONNECT => we auto_connect.
ON => Settings app box is checked and we allow incoming connections.
OFF => Settings app check box is unchecked.

Dr no: Eastham
Bug: 2133530
2009-12-02 15:38:52 -08:00
Jaikumar Ganesh
42499a85e8 Change priority for Headset profile on the same lines as A2DP profile.
AUTO_CONNECT => we auto_connect.
ON => Settings app box is checked and we allow incoming connections.
OFF => Settings app check box is unchecked.
2009-11-30 10:32:27 -08:00
Jaikumar Ganesh
210667f353 Update to reflect new priorities for A2DP profile.
1. PRIORITY_OFF is when it is unchecked.
2. PRIORITY_ON is when it is checked.
3. PRIORITY_AUTO_CONNECT is when we want to auto connect.

When the box is checked, we want to auto connect,
so set the priority to AUTO_CONNECT.
When the user disconnects, we set the priority back
to PRIORITY_ON.
2009-11-24 14:43:45 -08:00
Michael Chan
4fcf94c47b am 5469ff8b: b/2226832 Showing Pairing Dialog in the foreground
Merge commit '5469ff8b3f9966c6f141078b37da5f178b7825e4' into eclair-mr2

* commit '5469ff8b3f9966c6f141078b37da5f178b7825e4':
  b/2226832 Showing Pairing Dialog in the foreground
2009-11-10 11:06:36 -08:00
Michael Chan
5469ff8b3f b/2226832 Showing Pairing Dialog in the foreground
Pairing Dialogs notifications (in the window shade) were not visible in full
screen apps e.g. gallery.  Showing Pairing Dialog in the foreground:
1) if the remote device was picked in the device picker in the last minute or
2) if the device was in discoverable mode in the last minute.
2009-11-10 10:37:54 -08:00
Michael Chan
51dfd4b035 am 834e5993: b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
Merge commit '834e5993e4f2f34d5aceb3196601b30231d00b07' into eclair-mr2

* commit '834e5993e4f2f34d5aceb3196601b30231d00b07':
  b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
2009-11-06 13:32:53 -08:00
Michael Chan
834e5993e4 b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
Also added test app.
2009-11-05 18:32:09 -08:00
Michael Chan
d55c31ead6 am 4d004e91: b/2238546 Fixed NPE in Settings when Bluetooth "class" is null
Merge commit '4d004e910732565ddd449c7c525f7d6cbd353392' into eclair-mr2

* commit '4d004e910732565ddd449c7c525f7d6cbd353392':
  b/2238546 Fixed NPE in Settings when Bluetooth "class" is null
2009-11-05 10:32:57 -08:00
Michael Chan
4d004e9107 b/2238546 Fixed NPE in Settings when Bluetooth "class" is null 2009-11-04 17:19:48 -08:00
Jaikumar Ganesh
db99bb3644 am c065348e: Show an error message when the remote side cancels the authentication and show OPP device list correctly.
Merge commit 'c065348ebaf1ea9301d7b96633bea4de8c78c2aa' into eclair-mr2

* commit 'c065348ebaf1ea9301d7b96633bea4de8c78c2aa':
  Show an error message when the remote side cancels the authentication
2009-10-08 17:30:28 -07:00
Michael Chan
81cdaff7b5 b/2173596 Cancel Bluetooth scanning when the user leaves Bluetooth Settings.
Change-Id: Ib4dd6254c90da619e853b1be22fba3ff1365258e
2009-10-08 11:55:47 -07:00
Jaikumar Ganesh
c065348eba Show an error message when the remote side cancels the authentication
and show OPP device list correctly.

Dr No: Eastham
Bug: 2174874
2009-10-08 08:06:27 -07:00
Nick Pelly
d1a04291c5 Update application code for BluetoothAdapter.getDefaultAdapter().
Change-Id: Ic8f2188a28631f55ceb048daff545ca5e6053f92
DrNo: eastham
Bug: 2158765
Joke: When is a car not a car? When it turns into a driveway.
2009-10-08 01:03:34 +02:00
Jaikumar Ganesh
98d76cc9b8 Remove STOPSHIP debug log.
Bug: 2151872
Dr No: Eastham
2009-10-06 08:01:21 -07:00
Android (Google) Code Review
6e6d2362cc Merge change I25f2afba into eclair
* changes:
  Check if a device is added to the cache before returning.
2009-10-01 16:07:49 -04:00
Jaikumar Ganesh
fca3c1cf8b Check if a device is added to the cache before returning.
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
2009-10-01 13:05:22 -07:00
Michael Chan
b547dda338 Don't auto-connect to OPP after pairing
Change-Id: Ie7e8a7ef7188f7ffa6b32595764c100a0d72be89
2009-09-30 23:08:19 -07:00
Michael Chan
e6531e253b b/2154978 Show only connectable profiles (Headset and& A2DP but not OPP) in Bluetooth Device Advance Options aka "Connect to..."
Change-Id: I34249a4828707bde491da4a82dca94ecf37cf490
2009-09-30 17:43:12 -07:00
Michael Chan
eaf13a2c15 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
2009-09-30 12:34:32 -07:00
Michael Chan
e1089ad338 b/2142065 Added Bluetooth API to allow developer to request the user's permission to enable discovery mode.
Change-Id: I6da1598661ad05b4cfd2b7cc81e05d3053df5777
2009-09-28 17:16:23 -07:00
Nick Pelly
079ee952bd Update application for android.bluetooth.ParcelUuid -> android.os.ParcelUuid
Change-Id: Iebf2b3ea9cac224e3e6c67e503b1063491dce5bb
2009-09-28 13:05:28 -07:00
Android (Google) Code Review
7b576e4917 Merge change 27058 into eclair
* changes:
  Fix device picker minor bug
2009-09-28 14:46:49 -04:00
Michael Chan
b662f54542 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.
Change-Id: I37c628e4a98157ed91d519518773a458dca36c00
2009-09-27 12:46:51 -07:00
Android (Google) Code Review
51a81002ec Merge change 27057 into eclair
* changes:
  Restrict Bluetooth adapater name length to 200 characters.
2009-09-25 13:28:10 -04:00
Lixin Yue
cd47ae6af2 Fix device picker minor bug
When in device picker screen, if other device triggers pairing process with own
device, after paired succssfully, it should not send intent to OppReceiver to
start file sending. We need check if the paired device is the one user selected.

Original Author: Lixin Yue
Modified by: Jaikumar Ganesh (jaikumar@google.com)

Change-Id: I32df995ba94417470cccaead492844a9c61c0846
2009-09-25 10:27:25 -07:00
Jaikumar Ganesh
4b6b2aa123 Restrict Bluetooth adapater name length to 200 characters.
The max allowed as per spec is 248.
Change-Id: I287fb7f861a30e736d6078923712433c52f3031a
2009-09-25 10:27:17 -07:00
Android (Google) Code Review
776dcff143 Merge change 26878 into eclair
* changes:
  b/2140751 Fixed the problem where BT device icon was showing until pairing happens (actually UUID comes in to be exact)
2009-09-25 13:12:40 -04:00
Michael Chan
cb844e2eab b/2140751 Fixed the problem where BT device icon was showing until pairing happens (actually UUID comes in to be exact)
Change-Id: I670f29d5f9a577ec177b049cfd9c775bf91b60c3
2009-09-25 10:11:26 -07:00
Michael Chan
f2f3ceebbd b/2138890 Pre-initilize Bluetooth profile managers
Change-Id: I633202457ca445308ec35b99260e603a85451042
2009-09-24 07:45:49 -07:00
Jaikumar Ganesh
1bfe73d0b1 Filter devices by UUID and then class.
The settings app has been updated to use UUIDs.
When there is a filter type set for device picket UI, use the
UUIDs first and then the class bits.

Change-Id: Ifde5dbc3a1cf25babce4c686002315aa3933de59
2009-09-23 10:35:36 -07:00
Michael Chan
2aef1f3c81 b/2126036 Improve remote device capability identification by switching to use UUIDs instead of class bits.
Change-Id: Ie60d1c579e40027c2174215c1989887a3250c9bc
2009-09-22 15:37:14 -07:00
Jaikumar Ganesh
363bd5554e Fix string name for bluetooth pairing and fix NPE
Change-Id: Ibfd0e1e1ed3e1a1e5939d0bdffd17e2e929317b1
2009-09-16 14:56:08 -07:00
Jaikumar Ganesh
3eb43fe7a4 Show name for incoming pairing requests.
Settings apps invalidates its cache whenever a new scan is started.
When there is a new incoming pairing request, we will not get a DeviceFound
signal, because its not due to a inquiry scan. Thus when the pairing request
is displayed, the settings app doesn't have it in cache and hence will
just display the address. Make it query the framework when it doesn't have the name.
2009-09-15 14:07:22 -07:00
Jaikumar Ganesh
5f23cb39a1 Modify settings for 2.1
Add incoming pairing dialog
Add DisplayPasskey handling of pairing keyboards with 2.1 devices.
Modify code path to show errors when bonding request fails.
Misc fixes like string changes.
2009-09-11 12:00:14 -07:00
Nick Pelly
16cc86315d Update application for Bluetooth API changes.
Change-Id: I8351611f0f0c5eda3e423dbe7e7b53e52d75ac36
2009-09-10 18:44:25 -07:00
Android (Google) Code Review
6ee7dd0913 Merge change 24435 into eclair
* changes:
  Fix display strings and enter passkey handling.
2009-09-09 18:06:30 -04:00
Jaikumar Ganesh
67efa271bb Fix display strings and enter passkey handling. 2009-09-09 15:03:24 -07:00
Nick Pelly
f4779354b3 Update application for Bluetooth API change: deprecation of BluetoothError. 2009-09-08 17:49:57 -07:00
Nick Pelly
ca564d6bda Update application for Bluetooth API change. 2009-09-08 16:24:03 -07:00
Michael Chan
77395cc39c b/2050798 Bluetooth Passkeys should always be 6 digits so show leading zeros if needed.
Removed extra new lines in the passkey and pin dialogs because the string didn't fit in landscape mode. (scrollbars to appeared)
2009-09-02 12:30:05 -07:00
Jaikumar Ganesh
cb6a3b3d9e Show error messages when Authentication fails.
Call Canceled when user presses "Don't Pair".
Thus for Authentication Failed cases we can show the message to the
user.
2009-08-21 11:55:29 -07:00