Added changes to allow single parameter to scan facade's method
setScanFilterServiceData to accept single parameter serviceData.
Cleaned up every instance of scan in advertise facade to avoid
confusion in logs.
Change-Id: Ia62e9859aa9cade460e7f05c9fc907c58a77da21
diff --git a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothLeAdvertiseFacade.java b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothLeAdvertiseFacade.java
index bad8195..13ab63e 100644
--- a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothLeAdvertiseFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothLeAdvertiseFacade.java
@@ -224,7 +224,7 @@
throw new Exception("Invalid settingsIndex input:" + Integer.toString(settingsIndex));
}
if (mAdvertiseCallbackList.get(callbackIndex) != null) {
- Log.d("bluetooth_le starting a background scan on callback index: "
+ Log.d("bluetooth_le starting a background advertise on callback index: "
+ Integer.toString(callbackIndex));
mAdvertise
.startAdvertising(mSettings, mData, mAdvertiseCallbackList.get(callbackIndex));
@@ -275,7 +275,7 @@
+ Integer.toString(settingsIndex));
}
if (mAdvertiseCallbackList.get(callbackIndex) != null) {
- Log.d("bluetooth_le starting a background scan on callback index: "
+ Log.d("bluetooth_le starting a background advertise on callback index: "
+ Integer.toString(callbackIndex));
mAdvertise
.startAdvertising(mSettings, mData, mScanResponse,
diff --git a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothLeScanFacade.java b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothLeScanFacade.java
index a5ad5c0..4b2a4cd 100644
--- a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothLeScanFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothLeScanFacade.java
@@ -768,7 +768,8 @@
.setServiceData(
new ParcelUuid(UUID.randomUUID()),
ConvertUtils.convertStringToByteArray(serviceData),
- ConvertUtils.convertStringToByteArray(serviceDataMask));
+ ConvertUtils.convertStringToByteArray(
+ serviceDataMask));
} else {
mScanFilterBuilder.setServiceData(new ParcelUuid(UUID.randomUUID()),
ConvertUtils.convertStringToByteArray(serviceData));
