Commit Graph

993 Commits

Author SHA1 Message Date
Ying Wang
50cb76f585 Rename ro.monkey to monkey.running
So that Monkey can set it before running and reset it after running.
2010-01-04 12:04:25 -08:00
Michael Chan
f4ec356df9 am d8eec52a: b/2318290 connect should be called instead of connect(profile) if device is unpaired.
Merge commit 'd8eec52a3786a51b38ed280afd84005e6da05ce6' into eclair-plus-aosp

* commit 'd8eec52a3786a51b38ed280afd84005e6da05ce6':
  b/2318290 connect should be called instead of connect(profile) if device is unpaired.
2009-12-21 14:36:14 -08:00
Michael Chan
d8eec52a37 b/2318290 connect should be called instead of connect(profile) if device is unpaired.
Change-Id: I5d665d1c3149ffc77387f96c3822e80b84c78de1
2009-12-17 14:30:05 -08:00
Michael Chan
eea5133fa9 am c0a606d2: b/2334482 Revert white spaces
Merge commit 'c0a606d2d639c34bb763b73974e04e55f2d2ad8d' into eclair-plus-aosp

* commit 'c0a606d2d639c34bb763b73974e04e55f2d2ad8d':
  b/2334482 Revert white spaces
2009-12-17 13:28:48 -08:00
Michael Chan
c0a606d2d6 b/2334482 Revert white spaces
Change-Id: I52981da0928a9852f3256a7cee1f03768d7735a4
2009-12-17 13:21:29 -08:00
Michael Chan
5147794329 am c611e5a7: b/2334482 Dock string changed to Music, ringer, alarms (silences phone)
Merge commit 'c611e5a7c6773f3410f7ba60dc34071f7301ed38' into eclair-plus-aosp

* commit 'c611e5a7c6773f3410f7ba60dc34071f7301ed38':
  b/2334482 Dock string changed to Music, ringer, alarms (silences phone)
2009-12-17 13:07:58 -08:00
Michael Chan
c611e5a7c6 b/2334482 Dock string changed to Music, ringer, alarms (silences phone)
Change-Id: I36ee0f20b35df1d8f91f543dd315fc8cef184143
2009-12-17 13:04:24 -08:00
Michael Chan
fcea8c0d13 am 29d70e44: b/2334482 Disable Music and audio by default for the docks
Merge commit '29d70e44e42946f7b78f950bad0c4b22c7d5cb5f' into eclair-plus-aosp

* commit '29d70e44e42946f7b78f950bad0c4b22c7d5cb5f':
  b/2334482 Disable Music and audio by default for the docks
2009-12-17 11:13:08 -08:00
Michael Chan
29d70e44e4 b/2334482 Disable Music and audio by default for the docks
Change-Id: I1d84cd1dfe54dd3ae4e9183a291cb8f3e0d5da5a
2009-12-17 10:49:14 -08:00
Michael Chan
f362dbcbd6 am 052ad242: b/2323277 Fixed race condition where the user clicks on the dialog before dismiss() is processed.
Merge commit '052ad24219bbb170d9d028a460741524a768915a' into eclair-plus-aosp

* commit '052ad24219bbb170d9d028a460741524a768915a':
  b/2323277 Fixed race condition where the user clicks on the dialog before dismiss() is processed.
2009-12-14 11:49:10 -08:00
Michael Chan
052ad24219 b/2323277 Fixed race condition where the user clicks on the dialog before dismiss() is processed.
Change-Id: Iae98c45e4c1c5d36f33d6519ee2adba515f6b9aa
2009-12-14 10:42:27 -08:00
Michael Chan
288bd281fd am 9463c2f8: b/2320107 NPE when receiving a Undock event without a device
Merge commit '9463c2f8d5f09ef9cc015405640bbf845f0f7a8a' into eclair-plus-aosp

* commit '9463c2f8d5f09ef9cc015405640bbf845f0f7a8a':
  b/2320107 NPE when receiving a Undock event without a device
2009-12-10 23:07:46 -08:00
Michael Chan
9463c2f8d5 b/2320107 NPE when receiving a Undock event without a device
Change-Id: Ic3c964f2d58462a1b7c82f2de2dd997679f90ba7
2009-12-10 22:53:14 -08:00
Michael Chan
9f7ec32409 am a87f2fd7: b/2320107 Fixed NPE for class bits. Docks do not have class bits.
Merge commit 'a87f2fd7d82e5055e0f9ea2c93704ed0b58f27ef' into eclair-plus-aosp

* commit 'a87f2fd7d82e5055e0f9ea2c93704ed0b58f27ef':
  b/2320107 Fixed NPE for class bits. Docks do not have class bits.
2009-12-10 16:55:15 -08:00
Michael Chan
a87f2fd7d8 b/2320107 Fixed NPE for class bits. Docks do not have class bits.
Change-Id: Ibe4f697a906010f8f3ee270b891db286a4976f8a
2009-12-10 16:07:11 -08:00
Jaikumar Ganesh
4e580673f2 am 613549a6: Merge change I2c3621d1 into eclair
Merge commit '613549a622eac8278c9f81a1df83484c256652bf' into eclair-plus-aosp

* commit '613549a622eac8278c9f81a1df83484c256652bf':
  Fix desk dock getting stuck after unpairing.
2009-12-10 02:46:39 -08:00
Android (Google) Code Review
613549a622 Merge change I2c3621d1 into eclair
* changes:
  Fix desk dock getting stuck after unpairing.
2009-12-10 02:44:12 -08:00
Michael Chan
f80de2f5b8 am d1469da1: Merge change I10036c49 into eclair
Merge commit 'd1469da150f44415135d657d57592f066670b317' into eclair-plus-aosp

* commit 'd1469da150f44415135d657d57592f066670b317':
  b/2296110 Disable debugging/logging code before shipping.
2009-12-10 02:44:11 -08:00
Android (Google) Code Review
d1469da150 Merge change I10036c49 into eclair
* changes:
  b/2296110 Disable debugging/logging code before shipping.
2009-12-10 02:41:41 -08:00
Jaikumar Ganesh
b172cd5d23 Fix desk dock getting stuck after unpairing.
Note: This is a workaround. The read problem is that
we are making a call to Bluez when it is not ready yet.
The interface has not been registered, so dbus call should fail.
We need to fix this properly.

Dr No: Eastham
Bug: 2317784
2009-12-10 02:02:47 -08:00
Jaikumar Ganesh
b7b2b225ea am 6e3ee10a: Fix auto connection of A2DP profile.
Merge commit '6e3ee10a99b4d71ffe8f2473dcb8c6dbf4da0ed5' into eclair-plus-aosp

* commit '6e3ee10a99b4d71ffe8f2473dcb8c6dbf4da0ed5':
  Fix auto connection of A2DP profile.
2009-12-09 19:25:14 -08:00
Jaikumar Ganesh
6e3ee10a99 Fix auto connection of A2DP profile.
When the user selects profiles from the UI, set priority to ON.

Dr No: Eastham
Bug: 2317323
2009-12-09 19:15:30 -08:00
Eric Fischer
74c71c24c8 am e273289c: Merge change Ic0ce5c9a into eclair
Merge commit 'e273289cfb74e08ef0ab35afe2ca34a167a533d8' into eclair-plus-aosp

* commit 'e273289cfb74e08ef0ab35afe2ca34a167a533d8':
  Import revised translations.  DO NOT MERGE
2009-12-09 18:10:21 -08:00
Android (Google) Code Review
e273289cfb Merge change Ic0ce5c9a into eclair
* changes:
  Import revised translations.  DO NOT MERGE
2009-12-09 18:04:10 -08:00
Michael Chan
6fd5bc935e b/2296110 Disable debugging/logging code before shipping.
Change-Id: I10036c49e3c3d61d0fa1af74f1f0cd9d03502103
2009-12-09 18:00:48 -08:00
Michael Chan
207e320d52 am d70e205b: Merge change I724fc8fd into eclair
Merge commit 'd70e205b4c6dbf9661b972aa208d5a42927bdd88' into eclair-plus-aosp

* commit 'd70e205b4c6dbf9661b972aa208d5a42927bdd88':
  b/2317194 Synchronize command queue to prevent ConcurrentModificationException from happening
2009-12-09 17:47:24 -08:00
Michael Chan
2a0770c9e4 am 1d5f14bd: Merge change I92124d28 into eclair
Merge commit '1d5f14bd54490ccd4c93dfe350aa5abfbfe9ceda' into eclair-plus-aosp

* commit '1d5f14bd54490ccd4c93dfe350aa5abfbfe9ceda':
  b/2296110 Car Dock - Stop service when done processing each command. Clean up logs.
2009-12-09 17:47:21 -08:00
Michael Chan
ed2ebf509b am 488a80a7: Merge change Id587a517 into eclair
Merge commit '488a80a7b111f5906bf51101785a95a6c640d265' into eclair-plus-aosp

* commit '488a80a7b111f5906bf51101785a95a6c640d265':
  b/2314560 Prevent PIN dialog from showing up on undocked docks
2009-12-09 17:47:17 -08:00
Android (Google) Code Review
d70e205b4c Merge change I724fc8fd into eclair
* changes:
  b/2317194 Synchronize command queue to prevent ConcurrentModificationException from happening
2009-12-09 17:45:07 -08:00
Android (Google) Code Review
1d5f14bd54 Merge change I92124d28 into eclair
* changes:
  b/2296110 Car Dock - Stop service when done processing each command. Clean up logs.
2009-12-09 17:45:03 -08:00
Android (Google) Code Review
488a80a7b1 Merge change Id587a517 into eclair
* changes:
  b/2314560 Prevent PIN dialog from showing up on undocked docks
2009-12-09 17:44:53 -08:00
Michael Chan
792edfcf12 b/2317194 Synchronize command queue to prevent ConcurrentModificationException from happening
Change-Id: I724fc8fd07d33cfa6e68221a766754dcb1f6aeba
2009-12-09 17:34:54 -08:00
Eric Fischer
c0ce5c9ae3 Import revised translations. DO NOT MERGE 2009-12-09 17:28:18 -08:00
Michael Chan
503c236db5 b/2296110 Car Dock - Stop service when done processing each command. Clean up logs.
Change-Id: I92124d2856e6c825a2b4148473431789a1f5b156
2009-12-09 17:27:56 -08:00
Michael Chan
d617a0781c b/2314560 Prevent PIN dialog from showing up on undocked docks
If unpaired while undocked, device will be removed from the BT device list.
If unpaired while docked, the user can do pair and connect. No PIN dialog will pop up.
If undocked after unpaired, device will be removed from the BT device list.

Change-Id: Id587a517999e08641451f78dec8696a06028cf16
2009-12-09 17:16:46 -08:00
Romain Guy
832bc8ee41 am a9f9031b: Display icons in the correct density in the ActivityPicker. This also fixes a memory leak in Home.
Merge commit 'a9f9031ba35433a7e009da6099b17cf603372a70' into eclair-plus-aosp

* commit 'a9f9031ba35433a7e009da6099b17cf603372a70':
  Display icons in the correct density in the ActivityPicker.
2009-12-09 15:25:34 -08:00
Romain Guy
a9f9031ba3 Display icons in the correct density in the ActivityPicker.
This also fixes a memory leak in Home.

Do not merge.

Change-Id: Ib69b4055fae2c8705887bbd12be7fa61b689eb03
2009-12-09 15:20:46 -08:00
Michael Chan
ffc30afb66 am 14638566: b/2296110 Car Dock - Enable BT if not already enabled.
Merge commit '146385663bb55d9f55ad179d3c35ccf5cac13fc8' into eclair-plus-aosp

* commit '146385663bb55d9f55ad179d3c35ccf5cac13fc8':
  b/2296110 Car Dock - Enable BT if not already enabled.
2009-12-08 14:22:17 -08:00
Michael Chan
146385663b b/2296110 Car Dock - Enable BT if not already enabled.
Change-Id: If1798f62c9438e58c342869176437067f941c8cb
2009-12-08 14:18:13 -08:00
Michael Chan
4e1e2d2bf6 am 0c75b2d2: Merge change I80790bdb into eclair
Merge commit '0c75b2d2dc35b88d5cb9db96afc72ed074ca5350' into eclair-plus-aosp

* commit '0c75b2d2dc35b88d5cb9db96afc72ed074ca5350':
  b/2296110 Dialog for setting up dock audio.
2009-12-07 20:50:54 -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
b659c9e410 am 55dc6cb9: Disconnect even Sinks in Connecting state while connecting another sink.
Merge commit '55dc6cb99db1f9f6677dfec5a25a34e933807be5' into eclair-plus-aosp

* commit '55dc6cb99db1f9f6677dfec5a25a34e933807be5':
  Disconnect even Sinks in Connecting state while connecting another sink.
2009-12-07 15:52:22 -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
85230695f7 am 0bd445b9: b/2296110 New Dialog which appears when phone is place on dock.
Merge commit '0bd445b974292dc3910b6bb85dcee7e7c378968f' into eclair-plus-aosp

* commit '0bd445b974292dc3910b6bb85dcee7e7c378968f':
  b/2296110 New Dialog which appears when phone is place on dock.
2009-12-03 20:44:50 -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
94c379ed14 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-plus-aosp

* 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:14:22 -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
08ff9396f7 am 9f1d9c16: Merge change I9a1ed7e4 into eclair
Merge commit '9f1d9c16887d2bdebce65ceb1ac80e1fedd9ef48' into eclair-plus-aosp

* commit '9f1d9c16887d2bdebce65ceb1ac80e1fedd9ef48':
  Update to reflect new priorities for A2DP profile. DO NOT MERGE.
2009-12-02 16:08:05 -08:00
Android (Google) Code Review
9f1d9c1688 Merge change I9a1ed7e4 into eclair
* changes:
  Update to reflect new priorities for A2DP profile. DO NOT MERGE.
2009-12-02 16:02:52 -08:00