diff options
author | Nick Pelly <npelly@google.com> | 2009-09-08 13:15:33 -0700 |
---|---|---|
committer | Nick Pelly <npelly@google.com> | 2009-09-09 10:52:02 -0700 |
commit | de893f550301a60274e87aa8168225e7a7a42184 (patch) | |
tree | c8458bccf747e7c8035c349d42b13616fc1d5ac8 /core/java/android/server | |
parent | 100f08613392c225b8dff3f1e1d586f981884e29 (diff) | |
download | frameworks_base-de893f550301a60274e87aa8168225e7a7a42184.zip frameworks_base-de893f550301a60274e87aa8168225e7a7a42184.tar.gz frameworks_base-de893f550301a60274e87aa8168225e7a7a42184.tar.bz2 |
API_CHANGE
Another round of Bluetooth API clean up, javadoc'ing and unhide'ing.
-- Symbols for getting/setting bluetooth state --
BluetoothAdapter.ACTION_STATE_CHANGED
BluetoothAdapter.EXTRA_STATE
BluetoothAdapter.EXTRA_PREVIOUS_STATE
BluetoothAdapter.STATE_OFF
BluetoothAdapter.STATE_TURNING_ON
BluetoothAdapter.STATE_ON
BluetoothAdapter.STATE_TURNING_OFF
BluetoothAdapter.isEnabled()
BluetoothAdapter.getState()
BluetoothAdapter.enable()
BluetoothAdapter.disable()
-- Symbols for getting/setting scan mode --
BluetoothAdapter.ACTION_SCAN_MODE_CHANGED
BluetoothAdapter.EXTRA_SCAN_MODE
BluetoothAdapter.EXTRA_PREVIOUS_SCAN_MODE
BluetoothAdapter.SCAN_MODE_NONE
BluetoothAdapter.SCAN_MODE_CONNECTABLE
BluetoothAdapter.SCAN_MODE_DISCOVERABLE
BluetoothAdapter.getScanMode()
BluetoothAdapter.setScanMode()
-- Symbols for getting address/names --
BluetoothAdapter.getAddress()
BluetoothAdapter.getName()
BluetoothAdapter.setName()
Diffstat (limited to 'core/java/android/server')
-rw-r--r-- | core/java/android/server/BluetoothA2dpService.java | 10 | ||||
-rw-r--r-- | core/java/android/server/BluetoothEventLoop.java | 6 | ||||
-rw-r--r-- | core/java/android/server/BluetoothService.java | 61 |
3 files changed, 41 insertions, 36 deletions
diff --git a/core/java/android/server/BluetoothA2dpService.java b/core/java/android/server/BluetoothA2dpService.java index d9fcb53..4fa81bb 100644 --- a/core/java/android/server/BluetoothA2dpService.java +++ b/core/java/android/server/BluetoothA2dpService.java @@ -81,14 +81,14 @@ public class BluetoothA2dpService extends IBluetoothA2dp.Stub { String action = intent.getAction(); BluetoothDevice device = intent.getParcelableExtra(BluetoothIntent.DEVICE); - if (action.equals(BluetoothIntent.BLUETOOTH_STATE_CHANGED_ACTION)) { - int state = intent.getIntExtra(BluetoothIntent.BLUETOOTH_STATE, + if (action.equals(BluetoothAdapter.ACTION_STATE_CHANGED)) { + int state = intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, BluetoothError.ERROR); switch (state) { - case BluetoothAdapter.BLUETOOTH_STATE_ON: + case BluetoothAdapter.STATE_ON: onBluetoothEnable(); break; - case BluetoothAdapter.BLUETOOTH_STATE_TURNING_OFF: + case BluetoothAdapter.STATE_TURNING_OFF: onBluetoothDisable(); break; } @@ -134,7 +134,7 @@ public class BluetoothA2dpService extends IBluetoothA2dp.Stub { mAdapter = (BluetoothAdapter) context.getSystemService(Context.BLUETOOTH_SERVICE); - mIntentFilter = new IntentFilter(BluetoothIntent.BLUETOOTH_STATE_CHANGED_ACTION); + mIntentFilter = new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED); mIntentFilter.addAction(BluetoothIntent.BOND_STATE_CHANGED_ACTION); mIntentFilter.addAction(BluetoothIntent.REMOTE_DEVICE_CONNECTED_ACTION); mContext.registerReceiver(mReceiver, mIntentFilter); diff --git a/core/java/android/server/BluetoothEventLoop.java b/core/java/android/server/BluetoothEventLoop.java index e341b74..9f36f7e 100644 --- a/core/java/android/server/BluetoothEventLoop.java +++ b/core/java/android/server/BluetoothEventLoop.java @@ -265,8 +265,8 @@ class BluetoothEventLoop { pairable.equals("true"), discoverable.equals("true")); if (mode >= 0) { - Intent intent = new Intent(BluetoothIntent.SCAN_MODE_CHANGED_ACTION); - intent.putExtra(BluetoothIntent.SCAN_MODE, mode); + Intent intent = new Intent(BluetoothAdapter.ACTION_SCAN_MODE_CHANGED); + intent.putExtra(BluetoothAdapter.EXTRA_SCAN_MODE, mode); intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT); mContext.sendBroadcast(intent, BLUETOOTH_PERM); } @@ -371,7 +371,7 @@ class BluetoothEventLoop { address = address.toUpperCase(); mPasskeyAgentRequestData.put(address, new Integer(nativeData)); - if (mBluetoothService.getBluetoothState() == BluetoothAdapter.BLUETOOTH_STATE_TURNING_OFF) { + if (mBluetoothService.getBluetoothState() == BluetoothAdapter.STATE_TURNING_OFF) { // shutdown path mBluetoothService.cancelPairingUserInput(address); return null; diff --git a/core/java/android/server/BluetoothService.java b/core/java/android/server/BluetoothService.java index 5fe0d4e..6940075 100644 --- a/core/java/android/server/BluetoothService.java +++ b/core/java/android/server/BluetoothService.java @@ -102,7 +102,7 @@ public class BluetoothService extends IBluetooth.Stub { disableNative(); } - mBluetoothState = BluetoothAdapter.BLUETOOTH_STATE_OFF; + mBluetoothState = BluetoothAdapter.STATE_OFF; mIsDiscovering = false; mAdapterProperties = new HashMap<String, String>(); mDeviceProperties = new HashMap<String, Map<String,String>>(); @@ -128,7 +128,7 @@ public class BluetoothService extends IBluetooth.Stub { public boolean isEnabled() { mContext.enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission"); - return mBluetoothState == BluetoothAdapter.BLUETOOTH_STATE_ON; + return mBluetoothState == BluetoothAdapter.STATE_ON; } public int getBluetoothState() { @@ -153,9 +153,9 @@ public class BluetoothService extends IBluetooth.Stub { mContext.enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission"); switch (mBluetoothState) { - case BluetoothAdapter.BLUETOOTH_STATE_OFF: + case BluetoothAdapter.STATE_OFF: return true; - case BluetoothAdapter.BLUETOOTH_STATE_ON: + case BluetoothAdapter.STATE_ON: break; default: return false; @@ -163,7 +163,7 @@ public class BluetoothService extends IBluetooth.Stub { if (mEnableThread != null && mEnableThread.isAlive()) { return false; } - setBluetoothState(BluetoothAdapter.BLUETOOTH_STATE_TURNING_OFF); + setBluetoothState(BluetoothAdapter.STATE_TURNING_OFF); // Allow 3 seconds for profiles to gracefully disconnect // TODO: Introduce a callback mechanism so that each profile can notify @@ -175,7 +175,7 @@ public class BluetoothService extends IBluetooth.Stub { private synchronized void finishDisable(boolean saveSetting) { - if (mBluetoothState != BluetoothAdapter.BLUETOOTH_STATE_TURNING_OFF) { + if (mBluetoothState != BluetoothAdapter.STATE_TURNING_OFF) { return; } mEventLoop.stop(); @@ -189,8 +189,8 @@ public class BluetoothService extends IBluetooth.Stub { } // update mode - Intent intent = new Intent(BluetoothIntent.SCAN_MODE_CHANGED_ACTION); - intent.putExtra(BluetoothIntent.SCAN_MODE, BluetoothAdapter.SCAN_MODE_NONE); + Intent intent = new Intent(BluetoothAdapter.ACTION_SCAN_MODE_CHANGED); + intent.putExtra(BluetoothAdapter.EXTRA_SCAN_MODE, BluetoothAdapter.SCAN_MODE_NONE); mContext.sendBroadcast(intent, BLUETOOTH_PERM); mIsDiscovering = false; @@ -200,7 +200,7 @@ public class BluetoothService extends IBluetooth.Stub { persistBluetoothOnSetting(false); } - setBluetoothState(BluetoothAdapter.BLUETOOTH_STATE_OFF); + setBluetoothState(BluetoothAdapter.STATE_OFF); // Log bluetooth off to battery stats. long ident = Binder.clearCallingIdentity(); @@ -237,13 +237,13 @@ public class BluetoothService extends IBluetooth.Stub { if (mIsAirplaneSensitive && isAirplaneModeOn()) { return false; } - if (mBluetoothState != BluetoothAdapter.BLUETOOTH_STATE_OFF) { + if (mBluetoothState != BluetoothAdapter.STATE_OFF) { return false; } if (mEnableThread != null && mEnableThread.isAlive()) { return false; } - setBluetoothState(BluetoothAdapter.BLUETOOTH_STATE_TURNING_ON); + setBluetoothState(BluetoothAdapter.STATE_TURNING_ON); mEnableThread = new EnableThread(saveSetting); mEnableThread.start(); return true; @@ -251,7 +251,7 @@ public class BluetoothService extends IBluetooth.Stub { /** Forcibly restart Bluetooth if it is on */ /* package */ synchronized void restart() { - if (mBluetoothState != BluetoothAdapter.BLUETOOTH_STATE_ON) { + if (mBluetoothState != BluetoothAdapter.STATE_ON) { return; } mRestart = true; @@ -267,9 +267,9 @@ public class BluetoothService extends IBluetooth.Stub { if (DBG) log("Bluetooth state " + mBluetoothState + " -> " + state); - Intent intent = new Intent(BluetoothIntent.BLUETOOTH_STATE_CHANGED_ACTION); - intent.putExtra(BluetoothIntent.BLUETOOTH_PREVIOUS_STATE, mBluetoothState); - intent.putExtra(BluetoothIntent.BLUETOOTH_STATE, state); + Intent intent = new Intent(BluetoothAdapter.ACTION_STATE_CHANGED); + intent.putExtra(BluetoothAdapter.EXTRA_PREVIOUS_STATE, mBluetoothState); + intent.putExtra(BluetoothAdapter.EXTRA_STATE, state); intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT); mBluetoothState = state; @@ -357,8 +357,8 @@ public class BluetoothService extends IBluetooth.Stub { mEnableThread = null; setBluetoothState(res ? - BluetoothAdapter.BLUETOOTH_STATE_ON : - BluetoothAdapter.BLUETOOTH_STATE_OFF); + BluetoothAdapter.STATE_ON : + BluetoothAdapter.STATE_OFF); if (res) { // Update mode @@ -411,7 +411,7 @@ public class BluetoothService extends IBluetooth.Stub { )); public synchronized void loadBondState() { - if (mBluetoothState != BluetoothAdapter.BLUETOOTH_STATE_TURNING_ON) { + if (mBluetoothState != BluetoothAdapter.STATE_TURNING_ON) { return; } String []bonds = null; @@ -633,17 +633,22 @@ public class BluetoothService extends IBluetooth.Stub { public synchronized boolean setScanMode(int mode) { mContext.enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH_ADMIN permission"); - boolean pairable = false, discoverable = false; - String modeString = scanModeToBluezString(mode); - if (modeString.equals("off")) { + boolean pairable = false; + boolean discoverable = false; + switch (mode) { + case BluetoothAdapter.SCAN_MODE_NONE: pairable = false; discoverable = false; - } else if (modeString.equals("pariable")) { + break; + case BluetoothAdapter.SCAN_MODE_CONNECTABLE: pairable = true; discoverable = false; - } else if (modeString.equals("discoverable")) { + case BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE: pairable = true; discoverable = true; + default: + Log.w(TAG, "Requested invalid scan mode " + mode); + return false; } setPropertyBoolean("Pairable", pairable); setPropertyBoolean("Discoverable", discoverable); @@ -709,7 +714,7 @@ public class BluetoothService extends IBluetooth.Stub { public synchronized int getScanMode() { mContext.enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission"); if (!isEnabled()) - return BluetoothError.ERROR; + return BluetoothAdapter.SCAN_MODE_NONE; boolean pairable = getProperty("Pairable").equals("true"); boolean discoverable = getProperty("Discoverable").equals("true"); @@ -1103,16 +1108,16 @@ public class BluetoothService extends IBluetooth.Stub { pw.println("\nmIsAirplaneSensitive = " + mIsAirplaneSensitive + "\n"); switch(mBluetoothState) { - case BluetoothAdapter.BLUETOOTH_STATE_OFF: + case BluetoothAdapter.STATE_OFF: pw.println("\nBluetooth OFF\n"); return; - case BluetoothAdapter.BLUETOOTH_STATE_TURNING_ON: + case BluetoothAdapter.STATE_TURNING_ON: pw.println("\nBluetooth TURNING ON\n"); return; - case BluetoothAdapter.BLUETOOTH_STATE_TURNING_OFF: + case BluetoothAdapter.STATE_TURNING_OFF: pw.println("\nBluetooth TURNING OFF\n"); return; - case BluetoothAdapter.BLUETOOTH_STATE_ON: + case BluetoothAdapter.STATE_ON: pw.println("\nBluetooth ON\n"); } |