Commit Graph

521 Commits

Author SHA1 Message Date
Jaikumar Ganesh
213d579f98 Merge "Don't disconnect the same device before connecting." into gingerbread 2010-09-16 19:08:32 -07:00
Jaikumar Ganesh
84905edb63 Don't disconnect the same device before connecting.
We Pair: Remote device sends incoming connection, we get connected.
We get BondingState change and we connect.
Settings app disconnects connected profiles and then connects
without checking whether we are disconnecting the same device itself.

How was it working before ? Settings app used to queue all
commands. The disconnect followed by the connect would work
but unnecessarily disconnect and then connect.
With the queuing moved to framework, the connect fails
since the disconnect status has not been broadcasted.

Settings app shouldn't be disconnecting connected profiles.
That logic should reside in the framework. There is an open bug
and when the new APIs get implemented this will get removed.

Change-Id: I32a7fa36ff3c3321691c55071498f985dcdcfe8e
2010-09-16 18:56:30 -07:00
Brad Fitzpatrick
eaea841be0 am f8a473c3: am c5c8dad0: Use new apply() instead of commit().
Merge commit 'f8a473c3985d7c818dc24f94330f210e1d56a409'

* commit 'f8a473c3985d7c818dc24f94330f210e1d56a409':
  Use new apply() instead of commit().
2010-09-15 07:08:52 -07:00
Brad Fitzpatrick
f8a473c398 am c5c8dad0: Use new apply() instead of commit().
Merge commit 'c5c8dad0afb84bda9495a0aa1f7d6a3db28de5cb' into gingerbread-plus-aosp

* commit 'c5c8dad0afb84bda9495a0aa1f7d6a3db28de5cb':
  Use new apply() instead of commit().
2010-09-14 10:29:35 -07:00
Brad Fitzpatrick
c5c8dad0af Use new apply() instead of commit().
apply() starts an async disk write and doesn't have a return
value but is otherwise identical in observable effects.

Change-Id: I0f528607319d7eb5136bb11fce0b24d8741ccdf9
2010-09-14 09:26:51 -07:00
Daisuke Miyakawa
6ebf8619d7 Fragmentize BluetoothSettings.
Add UserLeaveHintListener.java, so that the settings won't use
its implementation around Activity#onUserLeaveHint().

Also fragmentize bluetooth tethering screen.

Change-Id: Id06ae3161fbdb5854ddb7a257f464fb16ea9b089
2010-09-13 16:18:05 -07:00
Jaikumar Ganesh
470ae03ec1 am 1647d472: am e714898a: Merge "OutOfband pairing user dialog." into gingerbread
Merge commit '1647d472a8c04069a0aab22730a54ec374185ea5'

* commit '1647d472a8c04069a0aab22730a54ec374185ea5':
  OutOfband pairing user dialog.
2010-09-13 14:42:36 -07:00
Jaikumar Ganesh
1647d472a8 am e714898a: Merge "OutOfband pairing user dialog." into gingerbread
Merge commit 'e714898a1abfd828a239e1be7b3f75e2a3cc2120' into gingerbread-plus-aosp

* commit 'e714898a1abfd828a239e1be7b3f75e2a3cc2120':
  OutOfband pairing user dialog.
2010-09-13 11:52:15 -07:00
Jaikumar Ganesh
a197eea307 OutOfband pairing user dialog.
Change-Id: I2f996067b983ad4678814040eb0773fa3968be13
2010-09-09 15:29:03 -07:00
Erik Ljungberg
df4a5b3ada am 6e6d0580: am 83c3b64f: BT: The Phone doesn\'t "wake up" when trying to pair with it.
Merge commit '6e6d05801e68e8d2cee2c708274dc8226f04f756'

* commit '6e6d05801e68e8d2cee2c708274dc8226f04f756':
  BT: The Phone doesn't "wake up" when trying to pair with it.
2010-09-01 22:07:22 -07:00
Erik Ljungberg
6e6d05801e am 83c3b64f: BT: The Phone doesn\'t "wake up" when trying to pair with it.
Merge commit '83c3b64ff7235e1382712a899ab0a269ce8a28d6' into gingerbread-plus-aosp

* commit '83c3b64ff7235e1382712a899ab0a269ce8a28d6':
  BT: The Phone doesn't "wake up" when trying to pair with it.
2010-09-01 22:04:59 -07:00
Erik Ljungberg
83c3b64ff7 BT: The Phone doesn't "wake up" when trying to pair with it.
To improve the pairing request usability:
- In the case where a notification shall be used the standard
  notification sound is added
- When the screen is off notification is always used.

Change-Id: I751a7913517c64de5d7ba06d7c17358197d002c5
2010-09-01 21:59:48 -07:00
Jaikumar Ganesh
8eb4986049 Match devices by Class for tethering.
Change-Id: I711de3c8d6f6b1dafeec4fb5dde4fa33d997bcca
2010-08-23 11:49:19 -07:00
Jake Hamby
2cd6aad561 am 2876ad62: am 2fcfb289: Merge " Fix Bluetooth Settings activity memory leak."
Merge commit '2876ad62082207e0e02cbc38b65ce9993cb121bf'

* commit '2876ad62082207e0e02cbc38b65ce9993cb121bf':
  Fix Bluetooth Settings activity memory leak.
2010-08-21 09:35:49 -07:00
Jake Hamby
2876ad6208 am 2fcfb289: Merge " Fix Bluetooth Settings activity memory leak."
Merge commit '2fcfb28982b84a6383774cfd50d6a963b1a985e1' into gingerbread-plus-aosp

* commit '2fcfb28982b84a6383774cfd50d6a963b1a985e1':
  Fix Bluetooth Settings activity memory leak.
2010-08-18 19:36:53 -07:00
Danica Chang
32711b6752 bluetooth tethering
Change-Id: I8dfb1c85bb8b963d2937b8bc4a4c9f0cf641785d
2010-08-17 19:07:07 -07:00
thigobr
d4cebee1e4 Fix Bluetooth Settings activity memory leak.
There were two leaks in Bluetooth Settings: one when rotating the
    phone and other when scanning for bluetooth devices.
2010-08-17 12:59:41 -03:00
The Android Open Source Project
e50496fb35 am be38a39f: merge from open-source master
Merge commit 'be38a39fc98d8574b747c57fea2aedd5d97fd333'

* commit 'be38a39fc98d8574b747c57fea2aedd5d97fd333':
  Fix window leak problems in settings.
2010-07-19 13:01:37 -07:00
The Android Open Source Project
be38a39fc9 merge from open-source master
Change-Id: Ibdfd887cae67bb6eba26e0f4e02765ad5b07e657
2010-07-19 12:52:09 -07:00
Jiehua.Dai
20108e2ed6 Fix window leak problems in settings.
There were window leak in the settings application.
These leak happens when an AlertDialog displays, rotate the phone,
then it would cause window leak.

Change-Id: I914897bf657933efea72eeea66076dc288098420
2010-07-14 11:10:00 +02:00
Adam Powell
792d2132e4 Add keyboard support to bluetooth settings.
Change-Id: I8fe41056acd074374cd249bfd0be6034f2614d37
2010-06-22 13:29:48 -07:00
Adam Powell
f907e0bb89 Fix bug 2713245 - Remove job queue from BT settings
Change-Id: I4e7269474cd270f22b16e9317e933ab87bff4929
2010-06-07 10:52:21 -07:00
Jaikumar Ganesh
8038834f8e Changing disconnectHeadset calls.
Change-Id: I2f058f28a09e983cd42e5a74bb4ffea19f07b880
2010-06-07 10:50:57 -07:00
Michael Chan
57d5585595 b/2680057 Fixed a bug where bt won't connect when the phone is docked (if Settings wasn't running).
The fix was to wait for the Bluetooth Headset service to come up before grabbing the settings and connecting.

Change-Id: I57affca2fe7d571c96cfeaf9ffe5439a0b02af45
2010-05-27 17:06:50 -07:00
Jaikumar Ganesh
d432bf76de Set profiles as preferred and then try to connect.
The APIs implementations are being updated to expose
A2DP and HFP APIs. A connect call is not honoured if its
not a preferred profile. So if an app changes the preference
of the profile than it should first update the state before
making the connect call. The API for updating preference
might not be exposed and will be mostly an API for app with ADMIN
privileges like Settings app.

Change-Id: I58b8e8201357bcfe615dc2322342520319d9e355
2010-05-24 18:00:56 -07:00
Michael Chan
d2c81986c2 b/2652059 Refresh UI after bond state change
Change-Id: I8f8a939ba3f383aae36091986cea4e8a6eae13fb
2010-05-07 15:24:22 -07:00
Michael Chan
1308453b16 b/2652059 Fixed the broken BT connects/disconnects after unpair
The unpair command was stuck in the queue.

Change-Id: I803cb10adcfaedbe6fd202e0db463593880e4280
2010-05-03 23:06:51 -07:00
Michael Chan
a0de1dcd19 b/2630339 Fixed the crash when an app requests BT to be enabled
For AlertActivity, the dialog needs to display at onCreate() time.
Otherwise, the decor view would be made. Trying to display the
dialog afterward would crash. Changed to AlertDialog instead.

Change-Id: I2ea8463b4c475b9b54746d0a722fa80eea3d4529
2010-04-28 11:24:00 -07:00
Michael Chan
96b0c1dc08 b/2608693 Fix the problem where BT was automatically reconnecting
... after the user unpaired while docked.

Change-Id: I65642f440109968387401fc3c103da0f2b15f49f
2010-04-22 16:07:35 -07:00
Michael Chan
293867bd10 b/2174155 Remove debug logging in bluetooth
Change-Id: Ia40af3bb362fe99fbfda1a23cdcb04fb96af7ca8
2010-04-07 13:31:21 -07:00
Michael Chan
d9db9e7621 Merge "b/2498180 b/2568119 Retry if BT dock disconnects unexpectedly" into froyo 2010-04-07 13:12:33 -07:00
Michael Chan
732c1dad5a b/2498180 b/2568119 Retry if BT dock disconnects unexpectedly
Change-Id: Ic4771e7c305192fee56f5f80c6cabeecf11a99dc
2010-04-06 15:42:04 -07:00
Adam Powell
54f334489c Fix bug 2564450 - prevent deadlock in BT settings
Change-Id: Iea5d341d771d18e5d9bf7c6686995ba6cbbf2172
2010-04-06 13:32:35 -07:00
Jaikumar Ganesh
cdc5e6eea2 Stop scanning as soon as device is picked in the device picker.
This improves OPP transfer time by a couple of seconds.

Change-Id: I40e8f092ca3950a2d180b78f07f1cc717f2daaf6
2010-03-25 14:21:10 -07:00
Michael Chan
4f94e0bee6 Merge "b/2310373 Show pairing dialogs if the device has been scanning for bt devices recently." 2010-03-03 21:29:22 -08:00
Michael Chan
76098b7f7a b/2310373 Show pairing dialogs if the device has been scanning for bt devices recently.
Change-Id: Iec9eb37a5e79b63cc3cf226e2ead6d9ed06d56a6
2010-03-03 12:35:49 -08:00
Michael Chan
628f9b3889 b/2482585 Bluetooth settings: remove "Scan for devices" from menu
Change-Id: I206794245a6afeb97366dd32e609f4e7f9374c20
2010-03-02 17:42:32 -08:00
Michael Chan
88d071fce4 am 3a6b2df2: am 324ab848: Merge "b/2370089 Pop the dock dialog above the keyguard" into eclair
Merge commit '3a6b2df23950cd64c10dfbb437aa56a99cbce54a'

* commit '3a6b2df23950cd64c10dfbb437aa56a99cbce54a':
  b/2370089 Pop the dock dialog above the keyguard
2010-01-25 18:09:45 -08:00
Michael Chan
4691219ce5 am fcd4e7fe: am 04bdae75: Merge "b/2332395 Fixed a bug where BT is not disabled if the phone was inserted and removed quickly." into eclair
Merge commit 'fcd4e7fec3c80d0a16630246c4942595d34c655c'

* commit 'fcd4e7fec3c80d0a16630246c4942595d34c655c':
  b/2332395 Fixed a bug where BT is not disabled if the phone was inserted and removed quickly.
2010-01-22 18:49:07 -08:00
Michael Chan
d0c57fdc02 am 97ed3f4b: am 3fe86a34: b/2332395 Disable BT when undocked if BT was off to at docking time unless if 1) the user has manually turned off bt while docked or 2) there\'s a connect device at the time we are ready to turn off bt
Merge commit '97ed3f4b1ce40fd3ec8bc34bf2bfb7438b28afd7'

* commit '97ed3f4b1ce40fd3ec8bc34bf2bfb7438b28afd7':
  b/2332395 Disable BT when undocked if BT was off to at docking time
2010-01-22 12:35:59 -08:00
Michael Chan
ae3311e5bd b/2370089 Pop the dock dialog above the keyguard
Change-Id: I958ac22defb057fd1ce98a711e3e92073588b1e8
2010-01-20 15:39:13 -08:00
Michael Chan
4e5d33d49f am 49efbf8b: am c9b9f650: Merge "b/2367861 Auto connect if the user turns on BT while docked." into eclair
Merge commit '49efbf8b5b7a6817a4a1020982cb34f4ca226d48'

* commit '49efbf8b5b7a6817a4a1020982cb34f4ca226d48':
  b/2367861 Auto connect if the user turns on BT while docked.
2010-01-20 14:35:08 -08:00
Michael Chan
c93b82496e b/2332395 Fixed a bug where BT is not disabled if the phone was inserted and removed quickly.
Change-Id: Ifa721afa9c4a9d83a4dd70ed75f5d66ec06a01f6
2010-01-19 22:35:28 -08:00
Michael Chan
3fe86a346c b/2332395 Disable BT when undocked if BT was off to at docking time
unless if 1) the user has manually turned off bt while docked or
2) there's a connect device at the time we are ready to turn off bt

Change-Id: Ic27308688a525120a09a25c9416b3cdc477412ab
2010-01-19 16:15:44 -08:00
Chia-chi Yeh
b90452f3d2 Settings: revise WifiEnabler and BluetoothEnabler.
This mainly changes the way both enablers react to the airplane mode. Now
enablers show a toast message instead of disabling the check box directly. This
avoids the inconsistent state introduced by WirelessSettings which controls the
check box using layout dependency.

Related bug: 2053751
2010-01-15 06:12:29 +08:00
Michael Chan
845e740fc6 b/2367861 Auto connect if the user turns on BT while docked.
Change-Id: I855d0448af9c9c665fb8288c83cd13ae9c3d6050
2010-01-14 11:26:18 -08:00
Michael Chan
07723b5966 am d69a5ee2: am c5aa68f3: b/2367020 Enable bt profiles by default for car dock.
Merge commit 'd69a5ee28cb5164233805a751a7c3deafba58668'

* commit 'd69a5ee28cb5164233805a751a7c3deafba58668':
  b/2367020 Enable bt profiles by default for car dock.
2010-01-12 13:45:36 -08:00
Michael Chan
c5aa68f3f2 b/2367020 Enable bt profiles by default for car dock.
Change-Id: I95b1330ab432d38fb509321d843d04a41185d331
2010-01-12 12:54:51 -08:00
Michael Chan
fb5b54d77a b/2335780 Fixed race conditions which causes BT to not be in the correct state in respect to the dock state. DO NOT MERGE
Change-Id: I02825cbde24ff0215787bb2d4f78cd6e7e1f4033
2010-01-08 18:33:43 -08:00
Michael Chan
89a363ebbc Merge "b/2335780 Fixed race conditions which causes BT to not be in the correct state in respect to the dock state." 2010-01-08 18:14:38 -08:00