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

1 files changed, 5 insertions, 3 deletions

diff --git a/wifi/java/android/net/wifi/WifiStateTracker.java b/wifi/java/android/net/wifi/WifiStateTracker.java
index 083cda3..fa24a98 100644
--- a/wifi/java/android/net/wifi/WifiStateTracker.java
+++ b/wifi/java/android/net/wifi/WifiStateTracker.java
@@ -39,6 +39,7 @@ import android.util.Log;
 import android.util.Config;
 import android.app.Notification;
 import android.app.PendingIntent;
+import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothHeadset;
 import android.bluetooth.BluetoothA2dp;
 import android.content.ContentResolver;
@@ -49,6 +50,7 @@ import com.android.internal.app.IBatteryStats;
 
 import java.util.List;
 import java.util.ArrayList;
+import java.util.Set;
 import java.net.UnknownHostException;
 
 /**
@@ -645,10 +647,10 @@ public class WifiStateTracker extends NetworkStateTracker {
 
     private void checkIsBluetoothPlaying() {
         boolean isBluetoothPlaying = false;
-        List<String> connected = mBluetoothA2dp.listConnectedSinks();
+        Set<BluetoothDevice> connected = mBluetoothA2dp.getConnectedSinks();
 
-        for (String address : connected) {
-            if (mBluetoothA2dp.getSinkState(address) == BluetoothA2dp.STATE_PLAYING) {
+        for (BluetoothDevice device : connected) {
+            if (mBluetoothA2dp.getSinkState(device) == BluetoothA2dp.STATE_PLAYING) {
                 isBluetoothPlaying = true;
                 break;
             }