Merge commit 'b37c4a09bbf9535db984b7165612184b4024a01e'
* commit 'b37c4a09bbf9535db984b7165612184b4024a01e':
b/2296110 Car Dock - Stop service when done processing each command. Clean up logs.
Merge commit 'd7a2f48458b5545b82ba83746753449c09c6daf1'
* commit 'd7a2f48458b5545b82ba83746753449c09c6daf1':
Display icons in the correct density in the ActivityPicker.
Merge commit '6e3ee10a99b4d71ffe8f2473dcb8c6dbf4da0ed5' into eclair-mr2
* commit '6e3ee10a99b4d71ffe8f2473dcb8c6dbf4da0ed5':
Fix auto connection of A2DP profile.
Merge commit '11c546162a489be5cc3a698e5c9f0bc4d3e65cab' into eclair-mr2-plus-aosp
* commit '11c546162a489be5cc3a698e5c9f0bc4d3e65cab':
Import revised translations. DO NOT MERGE
Merge commit '5217a122d70dfeb74f0a2b0e0a73d920ec9d58d7' into eclair-mr2-plus-aosp
* commit '5217a122d70dfeb74f0a2b0e0a73d920ec9d58d7':
b/2296110 Car Dock - Stop service when done processing each command. Clean up logs.
Merge commit '20b0ae927ef82f8dd31a1c7a1b3784caaf88bfa0' into eclair-mr2-plus-aosp
* commit '20b0ae927ef82f8dd31a1c7a1b3784caaf88bfa0':
b/2314560 Prevent PIN dialog from showing up on undocked docks
Merge commit '1c96b2cd6da03f978686be572c63a6a6fd4be1ef' into eclair-mr2-plus-aosp
* commit '1c96b2cd6da03f978686be572c63a6a6fd4be1ef':
Display icons in the correct density in the ActivityPicker.
Merge commit 'e273289cfb74e08ef0ab35afe2ca34a167a533d8' into eclair-mr2
* commit 'e273289cfb74e08ef0ab35afe2ca34a167a533d8':
Import revised translations. DO NOT MERGE
Merge commit '1d5f14bd54490ccd4c93dfe350aa5abfbfe9ceda' into eclair-mr2
* commit '1d5f14bd54490ccd4c93dfe350aa5abfbfe9ceda':
b/2296110 Car Dock - Stop service when done processing each command. Clean up logs.
Merge commit '488a80a7b111f5906bf51101785a95a6c640d265' into eclair-mr2
* commit '488a80a7b111f5906bf51101785a95a6c640d265':
b/2314560 Prevent PIN dialog from showing up on undocked docks
Merge commit 'a9f9031ba35433a7e009da6099b17cf603372a70' into eclair-mr2
* commit 'a9f9031ba35433a7e009da6099b17cf603372a70':
Display icons in the correct density in the ActivityPicker.
Merge commit 'a87f2fd7d82e5055e0f9ea2c93704ed0b58f27ef' into eclair-plus-aosp
* commit 'a87f2fd7d82e5055e0f9ea2c93704ed0b58f27ef':
b/2320107 Fixed NPE for class bits. Docks do not have class bits.
Merge commit 'a702cab6cf99c6c2168f0662d9c15adbf76011ab'
* commit 'a702cab6cf99c6c2168f0662d9c15adbf76011ab':
Wifi diagnostic app to enable debug and provide information
Merge commit '2ff62e2c7b1ecf2f4463cc8b683ea52e32337b9d' into eclair-mr2-plus-aosp
* commit '2ff62e2c7b1ecf2f4463cc8b683ea52e32337b9d':
Wifi diagnostic app to enable debug and provide information
This is the first checkin on the wifi diagnostic app. Right now,
it supports using the WifiManager API, shows the configuration details
and provides status on the supplicant, network and wifi state along with
some additional details.
More to come:
- add more API and status on any additional fields
- provide a way to show some logs
Bug: 2302130
Merge commit '1ac497b219aef7de2de4449a93666ab4ba5cb181'
* commit '1ac497b219aef7de2de4449a93666ab4ba5cb181':
Fix NPE when APPWIDGET_PICK has no value for EXTRA_CUSTOM_INFO
Merge commit 'd5f1e194a608f9985ae95c6fa061f2468b499a52'
* commit 'd5f1e194a608f9985ae95c6fa061f2468b499a52':
Display icons in the correct density in the ActivityPicker.
Merge commit 'f4b337ce10dc555ac7a1588156715af232c2be0c'
* commit 'f4b337ce10dc555ac7a1588156715af232c2be0c':
b/2296110 Car Dock - Enable BT if not already enabled.
Merge commit 'af03e5f0f32d56b831bdb2c849e32af796e49306'
* commit 'af03e5f0f32d56b831bdb2c849e32af796e49306':
b/2296110 Dialog for setting up dock audio.
Merge commit '0f9fe5ac7112624be064a7fc5bcf6f0abe0c0250'
* commit '0f9fe5ac7112624be064a7fc5bcf6f0abe0c0250':
Disconnect even Sinks in Connecting state while connecting another sink.
Merge commit '613549a622eac8278c9f81a1df83484c256652bf' into eclair-plus-aosp
* commit '613549a622eac8278c9f81a1df83484c256652bf':
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
Merge commit 'd6e36463eabbff9412a24fcff5f5e2c3682c989f' into eclair-mr2-plus-aosp
* commit 'd6e36463eabbff9412a24fcff5f5e2c3682c989f':
Fix NPE when APPWIDGET_PICK has no value for EXTRA_CUSTOM_INFO
Merge commit '6e3ee10a99b4d71ffe8f2473dcb8c6dbf4da0ed5' into eclair-plus-aosp
* commit '6e3ee10a99b4d71ffe8f2473dcb8c6dbf4da0ed5':
Fix auto connection of A2DP profile.
Merge commit 'e273289cfb74e08ef0ab35afe2ca34a167a533d8' into eclair-plus-aosp
* commit 'e273289cfb74e08ef0ab35afe2ca34a167a533d8':
Import revised translations. DO NOT MERGE
Merge commit '1d5f14bd54490ccd4c93dfe350aa5abfbfe9ceda' into eclair-plus-aosp
* commit '1d5f14bd54490ccd4c93dfe350aa5abfbfe9ceda':
b/2296110 Car Dock - Stop service when done processing each command. Clean up logs.
Merge commit '488a80a7b111f5906bf51101785a95a6c640d265' into eclair-plus-aosp
* commit '488a80a7b111f5906bf51101785a95a6c640d265':
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
Merge commit '267a47e683f744e4d77b9aa6aec017e5068bb443' into eclair-mr2-plus-aosp
* commit '267a47e683f744e4d77b9aa6aec017e5068bb443':
Display icons in the correct density in the ActivityPicker.
Merge commit 'a20da808f04f05cc31c50ff875ea39509790ffd4' into eclair-mr2-plus-aosp
* commit 'a20da808f04f05cc31c50ff875ea39509790ffd4':
b/2296110 Car Dock - Enable BT if not already enabled.
Merge commit '41eb38412a0c1337ea4e61dcc4d35f82292ba0ae' into eclair-mr2-plus-aosp
* commit '41eb38412a0c1337ea4e61dcc4d35f82292ba0ae':
b/2296110 Dialog for setting up dock audio.
