diff options
author | Nick Pelly <npelly@google.com> | 2009-08-14 18:33:38 -0700 |
---|---|---|
committer | Nick Pelly <npelly@google.com> | 2009-08-18 08:24:22 -0700 |
commit | bd022f423a33f0794bb53e5b0720da2d67e4631c (patch) | |
tree | 4def583f15b783ada3d49866a8cd29bcdb1bbe00 /services | |
parent | 82e7408be29c6c8c6ed80887ea97f48f38b3223d (diff) | |
download | frameworks_base-bd022f423a33f0794bb53e5b0720da2d67e4631c.zip frameworks_base-bd022f423a33f0794bb53e5b0720da2d67e4631c.tar.gz frameworks_base-bd022f423a33f0794bb53e5b0720da2d67e4631c.tar.bz2 |
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
Diffstat (limited to 'services')
-rw-r--r-- | services/java/com/android/server/SystemServer.java | 8 | ||||
-rw-r--r-- | services/java/com/android/server/status/StatusBarPolicy.java | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index ce476eb..98f35f4 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -36,7 +36,7 @@ import android.os.*; import android.provider.Contacts.People; import android.provider.Settings; import android.server.BluetoothA2dpService; -import android.server.BluetoothDeviceService; +import android.server.BluetoothService; import android.server.search.SearchManagerService; import android.util.EventLog; import android.util.Log; @@ -89,7 +89,7 @@ class ServerThread extends Thread { IPackageManager pm = null; Context context = null; WindowManagerService wm = null; - BluetoothDeviceService bluetooth = null; + BluetoothService bluetooth = null; BluetoothA2dpService bluetoothA2dp = null; HeadsetObserver headset = null; DockObserver dock = null; @@ -176,9 +176,9 @@ class ServerThread extends Thread { ServiceManager.addService(Context.BLUETOOTH_SERVICE, null); } else { Log.i(TAG, "Starting Bluetooth Service."); - bluetooth = new BluetoothDeviceService(context); - bluetooth.init(); + bluetooth = new BluetoothService(context); ServiceManager.addService(Context.BLUETOOTH_SERVICE, bluetooth); + bluetooth.initAfterRegistration(); bluetoothA2dp = new BluetoothA2dpService(context, bluetooth); ServiceManager.addService(BluetoothA2dpService.BLUETOOTH_A2DP_SERVICE, bluetoothA2dp); diff --git a/services/java/com/android/server/status/StatusBarPolicy.java b/services/java/com/android/server/status/StatusBarPolicy.java index e71d329..33d899a 100644 --- a/services/java/com/android/server/status/StatusBarPolicy.java +++ b/services/java/com/android/server/status/StatusBarPolicy.java @@ -18,7 +18,7 @@ package com.android.server.status; import android.app.AlertDialog; import android.bluetooth.BluetoothA2dp; -import android.bluetooth.BluetoothDevice; +import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothError; import android.bluetooth.BluetoothHeadset; import android.bluetooth.BluetoothIntent; @@ -473,10 +473,10 @@ public class StatusBarPolicy { mBluetoothData = IconData.makeIcon("bluetooth", null, com.android.internal.R.drawable.stat_sys_data_bluetooth, 0, 0); mBluetoothIcon = service.addIcon(mBluetoothData, null); - BluetoothDevice bluetooth = - (BluetoothDevice) mContext.getSystemService(Context.BLUETOOTH_SERVICE); - if (bluetooth != null) { - mBluetoothEnabled = bluetooth.isEnabled(); + BluetoothAdapter adapter = + (BluetoothAdapter) mContext.getSystemService(Context.BLUETOOTH_SERVICE); + if (adapter != null) { + mBluetoothEnabled = adapter.isEnabled(); } else { mBluetoothEnabled = false; } @@ -1083,7 +1083,7 @@ public class StatusBarPolicy { if (action.equals(BluetoothIntent.BLUETOOTH_STATE_CHANGED_ACTION)) { int state = intent.getIntExtra(BluetoothIntent.BLUETOOTH_STATE, BluetoothError.ERROR); - mBluetoothEnabled = state == BluetoothDevice.BLUETOOTH_STATE_ON; + mBluetoothEnabled = state == BluetoothAdapter.BLUETOOTH_STATE_ON; } else if (action.equals(BluetoothIntent.HEADSET_STATE_CHANGED_ACTION)) { mBluetoothHeadsetState = intent.getIntExtra(BluetoothIntent.HEADSET_STATE, BluetoothHeadset.STATE_ERROR); |