Fix the build by adding the file missing from the original commit.
Revert "Revert "Moving bluetooth related facades to package .facade.bluetooth""
This reverts commit ab86abfcda9eb0fb07c441942bed61320f198056.
Change-Id: Ia31a0e2c3e1553c59188bd52676b52879ff197a0
diff --git a/Common/src/com/googlecode/android_scripting/bluetooth/BluetoothHspFacade.java b/Common/src/com/googlecode/android_scripting/bluetooth/BluetoothHspFacade.java
deleted file mode 100644
index 2b35e90..0000000
--- a/Common/src/com/googlecode/android_scripting/bluetooth/BluetoothHspFacade.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.googlecode.android_scripting.bluetooth;
-
-import java.util.List;
-
-import android.app.Service;
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothHeadset;
-import android.bluetooth.BluetoothProfile;
-import android.bluetooth.BluetoothUuid;
-import android.os.ParcelUuid;
-
-import com.googlecode.android_scripting.Log;
-import com.googlecode.android_scripting.facade.FacadeManager;
-import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
-import com.googlecode.android_scripting.rpc.Rpc;
-import com.googlecode.android_scripting.rpc.RpcParameter;
-
-public class BluetoothHspFacade extends RpcReceiver {
- static final ParcelUuid[] HSP_UUIDS = { BluetoothUuid.HSP,
- BluetoothUuid.Handsfree, };
-
- private final Service mService;
- private final BluetoothAdapter mBluetoothAdapter;
-
- private boolean mIsHspReady = false;
- private BluetoothHeadset mHspProfile = null;
-
- public BluetoothHspFacade(FacadeManager manager) {
- super(manager);
- mService = manager.getService();
- mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
- mBluetoothAdapter.getProfileProxy(mService, new HspServiceListener(),
- BluetoothProfile.HEADSET);
- }
-
- class HspServiceListener implements BluetoothProfile.ServiceListener {
- @Override
- public void onServiceConnected(int profile, BluetoothProfile proxy) {
- mHspProfile = (BluetoothHeadset) proxy;
- mIsHspReady = true;
- }
-
- @Override
- public void onServiceDisconnected(int profile) {
- mIsHspReady = false;
- }
- }
-
- public Boolean hspConnect(BluetoothDevice device) {
- return mHspProfile.connect(device);
- }
-
- public Boolean hspDisconnect(BluetoothDevice device) {
- if (mHspProfile.getPriority(device) > BluetoothProfile.PRIORITY_ON) {
- mHspProfile.setPriority(device, BluetoothProfile.PRIORITY_ON);
- }
- return mHspProfile.disconnect(device);
- }
-
- @Rpc(description = "Is Hsp profile ready.")
- public Boolean bluetoothHspIsReady() {
- return mIsHspReady;
- }
-
- @Rpc(description = "Connect to HSP device.")
- public Boolean bluetoothHspConnect(
- @RpcParameter(name = "device", description = "Name or MAC address of a bluetooth device.")
- String device)
- throws Exception {
- if (mHspProfile == null)
- return false;
- BluetoothDevice mDevice = BluetoothFacade.getDevice(
- BluetoothFacade.DiscoveredDevices, device);
- Log.d("Connecting to device " + mDevice.getAliasName());
- return hspConnect(mDevice);
- }
-
- @Rpc(description = "Disconnect an HSP device.")
- public Boolean bluetoothHspDisconnect(
- @RpcParameter(name = "device", description = "Name or MAC address of a bluetooth device.")
- String device)
- throws Exception {
- if (mHspProfile == null)
- return false;
- BluetoothDevice mDevice = BluetoothFacade.getDevice(
- mHspProfile.getConnectedDevices(), device);
- return hspDisconnect(mDevice);
- }
-
- @Rpc(description = "Return the list of devices connected through Hsp.")
- public List<BluetoothDevice> bluetoothHspGetConnectedDevices() {
- return mHspProfile.getConnectedDevices();
- }
-
- @Override
- public void shutdown() {
- }
-}
diff --git a/Common/src/com/googlecode/android_scripting/bluetooth/BluetoothA2dpFacade.java b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothA2dpFacade.java
similarity index 85%
rename from Common/src/com/googlecode/android_scripting/bluetooth/BluetoothA2dpFacade.java
rename to Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothA2dpFacade.java
index a7cb7b6..50e6758 100644
--- a/Common/src/com/googlecode/android_scripting/bluetooth/BluetoothA2dpFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothA2dpFacade.java
@@ -1,4 +1,4 @@
-package com.googlecode.android_scripting.bluetooth;
+package com.googlecode.android_scripting.facade.bluetooth;
import java.util.List;
@@ -25,6 +25,7 @@
private static boolean sIsA2dpReady = false;
private static BluetoothA2dp sA2dpProfile = null;
+ private static BluetoothAvrcpFacade sAvrcpProfile = null;
public BluetoothA2dpFacade(FacadeManager manager) {
super(manager);
@@ -32,6 +33,7 @@
mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
mBluetoothAdapter.getProfileProxy(mService, new A2dpServiceListener(),
BluetoothProfile.A2DP);
+ sAvrcpProfile = manager.getReceiver(BluetoothAvrcpFacade.class);
}
class A2dpServiceListener implements BluetoothProfile.ServiceListener {
@@ -90,8 +92,11 @@
if (sA2dpProfile == null)
return false;
Log.d("Connected devices: " + sA2dpProfile.getConnectedDevices());
- BluetoothDevice mDevice = BluetoothFacade.getDevice(sA2dpProfile.getConnectedDevices(),
- deviceID);
+ List<BluetoothDevice> connected_a2dp = sA2dpProfile.getConnectedDevices();
+ //List<BluetoothDevice> connected_avrcp = sAvrcpProfile.bluetoothAvrcpGetConnectedDevices();
+ //connected_a2dp.addAll(connected_avrcp);
+ Log.d("Connected a2dp devices " + connected_a2dp);
+ BluetoothDevice mDevice = BluetoothFacade.getDevice(connected_a2dp, deviceID);
return a2dpDisconnect(mDevice);
}
diff --git a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothAvrcpFacade.java b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothAvrcpFacade.java
new file mode 100644
index 0000000..1fc26aa
--- /dev/null
+++ b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothAvrcpFacade.java
@@ -0,0 +1,62 @@
+package com.googlecode.android_scripting.facade.bluetooth;
+
+import java.util.List;
+
+import android.app.Service;
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothAvrcpController;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothProfile;
+import android.bluetooth.BluetoothUuid;
+import android.os.ParcelUuid;
+
+import com.googlecode.android_scripting.facade.FacadeManager;
+import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
+import com.googlecode.android_scripting.rpc.Rpc;
+
+public class BluetoothAvrcpFacade extends RpcReceiver {
+ static final ParcelUuid[] AVRCP_UUIDS = {
+ BluetoothUuid.AvrcpTarget, BluetoothUuid.AvrcpController
+ };
+ private final Service mService;
+ private final BluetoothAdapter mBluetoothAdapter;
+
+ private static boolean sIsAvrcpReady = false;
+ private static BluetoothAvrcpController sAvrcpProfile = null;
+
+ public BluetoothAvrcpFacade(FacadeManager manager) {
+ super(manager);
+ mService = manager.getService();
+ mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+ mBluetoothAdapter.getProfileProxy(mService, new AvrcpServiceListener(),
+ BluetoothProfile.AVRCP_CONTROLLER);
+ }
+
+ class AvrcpServiceListener implements BluetoothProfile.ServiceListener {
+ @Override
+ public void onServiceConnected(int profile, BluetoothProfile proxy) {
+ sAvrcpProfile = (BluetoothAvrcpController) proxy;
+ sIsAvrcpReady = true;
+ }
+
+ @Override
+ public void onServiceDisconnected(int profile) {
+ sIsAvrcpReady = false;
+ }
+ }
+
+ @Rpc(description = "Is Avrcp profile ready.")
+ public Boolean bluetoothAvrcpIsReady() {
+ return sIsAvrcpReady;
+ }
+
+ @Rpc(description = "Get all the devices connected through AVRCP.")
+ public List<BluetoothDevice> bluetoothAvrcpGetConnectedDevices() {
+ while (!sIsAvrcpReady);
+ return sAvrcpProfile.getConnectedDevices();
+ }
+
+ @Override
+ public void shutdown() {
+ }
+}
diff --git a/Common/src/com/googlecode/android_scripting/bluetooth/BluetoothBroadcastHelper.java b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothBroadcastHelper.java
similarity index 96%
rename from Common/src/com/googlecode/android_scripting/bluetooth/BluetoothBroadcastHelper.java
rename to Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothBroadcastHelper.java
index 399d179..6a201b4 100644
--- a/Common/src/com/googlecode/android_scripting/bluetooth/BluetoothBroadcastHelper.java
+++ b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothBroadcastHelper.java
@@ -14,7 +14,7 @@
* the License.
*/
-package com.googlecode.android_scripting.bluetooth;
+package com.googlecode.android_scripting.facade.bluetooth;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
diff --git a/Common/src/com/googlecode/android_scripting/bluetooth/BluetoothConnectionFacade.java b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothConnectionFacade.java
similarity index 98%
rename from Common/src/com/googlecode/android_scripting/bluetooth/BluetoothConnectionFacade.java
rename to Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothConnectionFacade.java
index dfddd74..b19ab0d 100644
--- a/Common/src/com/googlecode/android_scripting/bluetooth/BluetoothConnectionFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothConnectionFacade.java
@@ -1,5 +1,5 @@
-package com.googlecode.android_scripting.bluetooth;
+package com.googlecode.android_scripting.facade.bluetooth;
import java.util.ArrayList;
import java.util.Collections;
@@ -30,10 +30,6 @@
public class BluetoothConnectionFacade extends RpcReceiver {
- static final ParcelUuid[] HSP_UUIDS = {
- BluetoothUuid.HSP, BluetoothUuid.Handsfree,
- };
-
private final Service mService;
private final BluetoothAdapter mBluetoothAdapter;
private final BluetoothPairingHelper mPairingHelper;
@@ -274,7 +270,7 @@
mEventFacade.postEvent("HidConnect", mBadNews);
}
}
- if (BluetoothUuid.containsAnyUuid(HSP_UUIDS, deviceUuids)) {
+ if (BluetoothUuid.containsAnyUuid(BluetoothHspFacade.HSP_UUIDS, deviceUuids)) {
boolean status = mHspProfile.hspConnect(device);
if (status) {
Log.d("Connecting Hsp...");
diff --git a/Common/src/com/googlecode/android_scripting/bluetooth/BluetoothDiscoveryHelper.java b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothDiscoveryHelper.java
similarity index 97%
rename from Common/src/com/googlecode/android_scripting/bluetooth/BluetoothDiscoveryHelper.java
rename to Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothDiscoveryHelper.java
index 062bd11..975f7be 100644
--- a/Common/src/com/googlecode/android_scripting/bluetooth/BluetoothDiscoveryHelper.java
+++ b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothDiscoveryHelper.java
@@ -14,7 +14,7 @@
* the License.
*/
-package com.googlecode.android_scripting.bluetooth;
+package com.googlecode.android_scripting.facade.bluetooth;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
diff --git a/Common/src/com/googlecode/android_scripting/bluetooth/BluetoothFacade.java b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothFacade.java
similarity index 99%
rename from Common/src/com/googlecode/android_scripting/bluetooth/BluetoothFacade.java
rename to Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothFacade.java
index f492d77..55451bf 100644
--- a/Common/src/com/googlecode/android_scripting/bluetooth/BluetoothFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothFacade.java
@@ -14,7 +14,7 @@
* the License.
*/
-package com.googlecode.android_scripting.bluetooth;
+package com.googlecode.android_scripting.facade.bluetooth;
import android.app.Service;
import android.bluetooth.BluetoothAdapter;
diff --git a/Common/src/com/googlecode/android_scripting/bluetooth/BluetoothGattFacade.java b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothGattFacade.java
similarity index 97%
rename from Common/src/com/googlecode/android_scripting/bluetooth/BluetoothGattFacade.java
rename to Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothGattFacade.java
index 1d5b586..45ec352 100644
--- a/Common/src/com/googlecode/android_scripting/bluetooth/BluetoothGattFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothGattFacade.java
@@ -1,5 +1,5 @@
-package com.googlecode.android_scripting.bluetooth;
+package com.googlecode.android_scripting.facade.bluetooth;
import java.util.ArrayList;
import java.util.HashMap;
@@ -770,15 +770,15 @@
mResults.clear();
}
- @Override
- public void onConnectionCongested(BluetoothGatt gatt, boolean congested) {
- Log.d("gatt_connect change onConnectionCongested " + mEventType + " " + index);
- mResults.putString("Type", "onConnectionCongested");
- mResults.putBoolean("Congested", congested);
- mEventFacade
- .postEvent(mEventType + index + "onConnectionCongested", mResults.clone());
- mResults.clear();
- }
+// @Override
+// public void onConnectionCongested(BluetoothGatt gatt, boolean congested) {
+// Log.d("gatt_connect change onConnectionCongested " + mEventType + " " + index);
+// mResults.putString("Type", "onConnectionCongested");
+// mResults.putBoolean("Congested", congested);
+// mEventFacade
+// .postEvent(mEventType + index + "onConnectionCongested", mResults.clone());
+// mResults.clear();
+// }
}
@Override
diff --git a/Common/src/com/googlecode/android_scripting/bluetooth/BluetoothHidFacade.java b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothHidFacade.java
similarity index 98%
rename from Common/src/com/googlecode/android_scripting/bluetooth/BluetoothHidFacade.java
rename to Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothHidFacade.java
index e0212e9..e456933 100644
--- a/Common/src/com/googlecode/android_scripting/bluetooth/BluetoothHidFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothHidFacade.java
@@ -1,4 +1,4 @@
-package com.googlecode.android_scripting.bluetooth;
+package com.googlecode.android_scripting.facade.bluetooth;
import java.util.List;
diff --git a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothHspFacade.java b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothHspFacade.java
new file mode 100644
index 0000000..e9e10d2
--- /dev/null
+++ b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothHspFacade.java
@@ -0,0 +1,118 @@
+package com.googlecode.android_scripting.facade.bluetooth;
+
+import java.util.List;
+
+import android.app.Service;
+import android.bluetooth.BluetoothHeadset;
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothProfile;
+import android.bluetooth.BluetoothUuid;
+import android.os.ParcelUuid;
+
+import com.googlecode.android_scripting.Log;
+import com.googlecode.android_scripting.facade.FacadeManager;
+import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
+import com.googlecode.android_scripting.rpc.Rpc;
+import com.googlecode.android_scripting.rpc.RpcParameter;
+
+public class BluetoothHspFacade extends RpcReceiver {
+ static final ParcelUuid[] HSP_UUIDS = {
+ BluetoothUuid.HSP, BluetoothUuid.Handsfree
+ };
+
+ private final Service mService;
+ private final BluetoothAdapter mBluetoothAdapter;
+
+ private static boolean sIsHspReady = false;
+ private static BluetoothHeadset sHspProfile = null;
+
+ public BluetoothHspFacade(FacadeManager manager) {
+ super(manager);
+ mService = manager.getService();
+ mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+ mBluetoothAdapter.getProfileProxy(mService, new HspServiceListener(),
+ BluetoothProfile.HEADSET);
+ }
+
+ class HspServiceListener implements BluetoothProfile.ServiceListener {
+ @Override
+ public void onServiceConnected(int profile, BluetoothProfile proxy) {
+ sHspProfile = (BluetoothHeadset) proxy;
+ sIsHspReady = true;
+ }
+
+ @Override
+ public void onServiceDisconnected(int profile) {
+ sIsHspReady = false;
+ }
+ }
+
+ public Boolean hspConnect(BluetoothDevice device) {
+ if (sHspProfile == null) return false;
+ return sHspProfile.connect(device);
+ }
+
+ public Boolean hspDisconnect(BluetoothDevice device) {
+ if (sHspProfile == null) return false;
+ return sHspProfile.disconnect(device);
+ }
+
+ @Rpc(description = "Is Hsp profile ready.")
+ public Boolean bluetoothHspIsReady() {
+ return sIsHspReady;
+ }
+
+ @Rpc(description = "Connect to an HSP device.")
+ public Boolean bluetoothHspConnect(
+ @RpcParameter(name = "device", description = "Name or MAC address of a bluetooth device.")
+ String device)
+ throws Exception {
+ if (sHspProfile == null)
+ return false;
+ BluetoothDevice mDevice = BluetoothFacade.getDevice(BluetoothFacade.DiscoveredDevices, device);
+ Log.d("Connecting to device " + mDevice.getAliasName());
+ return hspConnect(mDevice);
+ }
+
+ @Rpc(description = "Disconnect an HSP device.")
+ public Boolean bluetoothHspDisconnect(
+ @RpcParameter(name = "device", description = "Name or MAC address of a device.")
+ String device)
+ throws Exception {
+ if (sHspProfile == null)
+ return false;
+ Log.d("Connected devices: " + sHspProfile.getConnectedDevices());
+ BluetoothDevice mDevice = BluetoothFacade.getDevice(sHspProfile.getConnectedDevices(),
+ device);
+ return hspDisconnect(mDevice);
+ }
+
+ @Rpc(description = "Get all the devices connected through HSP.")
+ public List<BluetoothDevice> bluetoothHspGetConnectedDevices() {
+ while (!sIsHspReady);
+ return sHspProfile.getConnectedDevices();
+ }
+
+ @Rpc(description = "Get the connection status of a device.")
+ public Integer bluetoothHspGetConnectionStatus(
+ @RpcParameter(name = "deviceID",
+ description = "Name or MAC address of a bluetooth device.")
+ String deviceID) {
+ if (sHspProfile == null) {
+ return BluetoothProfile.STATE_DISCONNECTED;
+ }
+ List<BluetoothDevice> deviceList = sHspProfile.getConnectedDevices();
+ BluetoothDevice device;
+ try {
+ device = BluetoothFacade.getDevice(deviceList, deviceID);
+ } catch (Exception e) {
+ return BluetoothProfile.STATE_DISCONNECTED;
+ }
+ return sHspProfile.getConnectionState(device);
+ }
+
+ @Override
+ public void shutdown() {
+ }
+}
diff --git a/Common/src/com/googlecode/android_scripting/bluetooth/BluetoothLeAdvertiseFacade.java b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothLeAdvertiseFacade.java
similarity index 99%
rename from Common/src/com/googlecode/android_scripting/bluetooth/BluetoothLeAdvertiseFacade.java
rename to Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothLeAdvertiseFacade.java
index 51a6ae4..952b9ab 100644
--- a/Common/src/com/googlecode/android_scripting/bluetooth/BluetoothLeAdvertiseFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothLeAdvertiseFacade.java
@@ -14,7 +14,7 @@
* the License.
*/
-package com.googlecode.android_scripting.bluetooth;
+package com.googlecode.android_scripting.facade.bluetooth;
import java.math.BigInteger;
import java.util.ArrayList;
diff --git a/Common/src/com/googlecode/android_scripting/bluetooth/BluetoothLeScanFacade.java b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothLeScanFacade.java
similarity index 99%
rename from Common/src/com/googlecode/android_scripting/bluetooth/BluetoothLeScanFacade.java
rename to Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothLeScanFacade.java
index 6148f26..be44ee5 100644
--- a/Common/src/com/googlecode/android_scripting/bluetooth/BluetoothLeScanFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothLeScanFacade.java
@@ -14,7 +14,7 @@
* the License.
*/
-package com.googlecode.android_scripting.bluetooth;
+package com.googlecode.android_scripting.facade.bluetooth;
import java.math.BigInteger;
import java.util.ArrayList;
diff --git a/Common/src/com/googlecode/android_scripting/bluetooth/BluetoothPairingHelper.java b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothPairingHelper.java
similarity index 94%
rename from Common/src/com/googlecode/android_scripting/bluetooth/BluetoothPairingHelper.java
rename to Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothPairingHelper.java
index e804c8a..12a25d6 100644
--- a/Common/src/com/googlecode/android_scripting/bluetooth/BluetoothPairingHelper.java
+++ b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothPairingHelper.java
@@ -1,4 +1,4 @@
-package com.googlecode.android_scripting.bluetooth;
+package com.googlecode.android_scripting.facade.bluetooth;
import android.bluetooth.BluetoothDevice;
import android.content.BroadcastReceiver;
diff --git a/Common/src/com/googlecode/android_scripting/bluetooth/BluetoothRfcommFacade.java b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothRfcommFacade.java
similarity index 99%
rename from Common/src/com/googlecode/android_scripting/bluetooth/BluetoothRfcommFacade.java
rename to Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothRfcommFacade.java
index dea358e..433be3d 100644
--- a/Common/src/com/googlecode/android_scripting/bluetooth/BluetoothRfcommFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothRfcommFacade.java
@@ -14,7 +14,7 @@
* the License.
*/
-package com.googlecode.android_scripting.bluetooth;
+package com.googlecode.android_scripting.facade.bluetooth;
import android.app.Service;
import android.bluetooth.BluetoothAdapter;
diff --git a/ScriptingLayer/src/com/googlecode/android_scripting/facade/FacadeConfiguration.java b/ScriptingLayer/src/com/googlecode/android_scripting/facade/FacadeConfiguration.java
index 5577ef4..8528785 100644
--- a/ScriptingLayer/src/com/googlecode/android_scripting/facade/FacadeConfiguration.java
+++ b/ScriptingLayer/src/com/googlecode/android_scripting/facade/FacadeConfiguration.java
@@ -17,15 +17,15 @@
package com.googlecode.android_scripting.facade;
import com.google.common.collect.Maps;
-import com.googlecode.android_scripting.bluetooth.BluetoothA2dpFacade;
-import com.googlecode.android_scripting.bluetooth.BluetoothConnectionFacade;
-import com.googlecode.android_scripting.bluetooth.BluetoothFacade;
-import com.googlecode.android_scripting.bluetooth.BluetoothGattFacade;
-import com.googlecode.android_scripting.bluetooth.BluetoothHidFacade;
-import com.googlecode.android_scripting.bluetooth.BluetoothHspFacade;
-import com.googlecode.android_scripting.bluetooth.BluetoothLeAdvertiseFacade;
-import com.googlecode.android_scripting.bluetooth.BluetoothLeScanFacade;
-import com.googlecode.android_scripting.bluetooth.BluetoothRfcommFacade;
+import com.googlecode.android_scripting.facade.bluetooth.BluetoothA2dpFacade;
+import com.googlecode.android_scripting.facade.bluetooth.BluetoothConnectionFacade;
+import com.googlecode.android_scripting.facade.bluetooth.BluetoothFacade;
+import com.googlecode.android_scripting.facade.bluetooth.BluetoothGattFacade;
+import com.googlecode.android_scripting.facade.bluetooth.BluetoothHidFacade;
+import com.googlecode.android_scripting.facade.bluetooth.BluetoothHspFacade;
+import com.googlecode.android_scripting.facade.bluetooth.BluetoothLeAdvertiseFacade;
+import com.googlecode.android_scripting.facade.bluetooth.BluetoothLeScanFacade;
+import com.googlecode.android_scripting.facade.bluetooth.BluetoothRfcommFacade;
import com.googlecode.android_scripting.facade.ui.UiFacade;
import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
import com.googlecode.android_scripting.rpc.MethodDescriptor;
diff --git a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/BluetoothDeviceList.java b/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/BluetoothDeviceList.java
index e347067..247c3d9 100644
--- a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/BluetoothDeviceList.java
+++ b/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/BluetoothDeviceList.java
@@ -28,8 +28,8 @@
import com.googlecode.android_scripting.Analytics;
import com.googlecode.android_scripting.Constants;
import com.googlecode.android_scripting.R;
-import com.googlecode.android_scripting.bluetooth.BluetoothDiscoveryHelper;
-import com.googlecode.android_scripting.bluetooth.BluetoothDiscoveryHelper.BluetoothDiscoveryListener;
+import com.googlecode.android_scripting.facade.bluetooth.BluetoothDiscoveryHelper;
+import com.googlecode.android_scripting.facade.bluetooth.BluetoothDiscoveryHelper.BluetoothDiscoveryListener;
import java.util.ArrayList;
import java.util.List;
