Fixed old problems. Long values to String.

Change-Id: Ib16a2d493c3531e64b4a0a13e554444ae9da7240
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 1df328a..f6d97ae 100644
--- a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothLeScanFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothLeScanFacade.java
@@ -16,7 +16,6 @@
 
 package com.googlecode.android_scripting.facade.bluetooth;
 
-import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -697,18 +696,18 @@
             @RpcParameter(name = "manufacturerDataId")
             Integer manufacturerDataId,
             @RpcParameter(name = "manufacturerData")
-            Long manufacturerData,
+            String manufacturerData,
             @RpcParameter(name = "manufacturerDataMask")
             @RpcOptional
-            Long manufacturerDataMask
+            String manufacturerDataMask
             ){
         if (manufacturerDataMask != null) {
             mScanFilterBuilder.setManufacturerData(manufacturerDataId,
-                    BigInteger.valueOf(manufacturerData).toByteArray(),
-                    BigInteger.valueOf(manufacturerDataMask).toByteArray());
+                    ConvertUtils.convertStringToByteArray(manufacturerData),
+                    ConvertUtils.convertStringToByteArray(manufacturerDataMask));
         } else {
             mScanFilterBuilder.setManufacturerData(manufacturerDataId,
-                    BigInteger.valueOf(manufacturerData).toByteArray());
+                    ConvertUtils.convertStringToByteArray(manufacturerData));
         }
     }
 
@@ -739,17 +738,17 @@
     @Rpc(description = "Add filter \"serviceData and serviceDataMask\" to existing ScanFilter ")
     public void setScanFilterServiceData(
             @RpcParameter(name = "serviceData")
-            Long serviceData,
+            String serviceData,
             @RpcParameter(name = "serviceDataMask")
             @RpcOptional
-            Long serviceDataMask
+            String serviceDataMask
             ) {
         if (serviceDataMask != null) {
             mScanFilterBuilder
-                    .setServiceData(BigInteger.valueOf(serviceData).toByteArray(),
-                            BigInteger.valueOf(serviceDataMask).toByteArray());
+                    .setServiceData(ConvertUtils.convertStringToByteArray(serviceData),
+                            ConvertUtils.convertStringToByteArray(serviceDataMask));
         } else {
-            mScanFilterBuilder.setServiceData(BigInteger.valueOf(serviceData).toByteArray());
+            mScanFilterBuilder.setServiceData(ConvertUtils.convertStringToByteArray(serviceData));
         }
     }