commit b3811cf1946f10201aeee3515be994ba1ea2df2d
author Tom Turney <tturney@google.com> Mon Jul 28 13:16:52 2014 -0700
committer Tom Turney <tturney@google.com> Mon Jul 28 13:23:25 2014 -0700
tree 8f3e136f4ef01530fbade0c952a5d6e5b60b530f
parent 2871bb3282f84a308adfd2a58078d95517a42dc6

Changed a few methods in BLEAdvertiseFacade in order to keep everything consistent

Change-Id: I131634f933221e4231b4dfa713dc78f830cd6b1f

Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothLeAdvertiseFacade.java

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 18f045f..413738e 100644
--- a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothLeAdvertiseFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothLeAdvertiseFacade.java
@@ -488,8 +488,7 @@
             if (mData.getServiceDataUuid() != null) {
                 return mData.getServiceDataUuid().toString();
             } else {
-                throw new Exception("Service Data Uuid not set for input "
-                        + "AdvertiseData: " + index);
+                return null;
             }
         } else {
             throw new Exception("Invalid index input:" + Integer.toString(index));
@@ -575,7 +574,7 @@
      * @throws Exception
      */
     @Rpc(description = "Set ble advertise settings advertise mode")
-    public void setAdvertisementSettingAdvertiseMode(
+    public void setAdvertisementSettingsAdvertiseMode(
             @RpcParameter(name = "advertiseMode")
             Integer advertiseMode
             ) {
@@ -589,7 +588,7 @@
      * @throws Exception
      */
     @Rpc(description = "Set ble advertise settings tx power level")
-    public void setAdvertisementSettingIncludeTxPowerLevel(
+    public void setAdvertisementSettingsIncludeTxPowerLevel(
             @RpcParameter(name = "includeTxPowerLevel")
             Integer txPowerLevel
             ) {
@@ -603,7 +602,7 @@
      * @throws Exception
      */
     @Rpc(description = "Set ble advertise settings isConnectable value")
-    public void setAdvertisementSettingType(
+    public void setAdvertisementSettingsIsConnectable(
             @RpcParameter(name = "value")
             Boolean value
             ) {