aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorAlexander Dorokhine <adorokhine@google.com>2017-05-01 19:58:54 -0700
committerGitHub <noreply@github.com>2017-05-01 19:58:54 -0700
commit6f3d76cabe9d284f1400e7ee2657b7406b8bf779 (patch)
treefb7cb84f7b6a852a8565f7361c391f457682f24b /src/main
parentdcae801dceef228c4c9be81f5ba61660ce90369f (diff)
downloadmobly-bundled-snippets-6f3d76cabe9d284f1400e7ee2657b7406b8bf779.tar.gz
Throw exceptions in case of failure to enable or disable HCI snoop log. (#42)
Returning boolean is not consistent with our style and is not done for any other method in MBS.
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/google/android/mobly/snippet/bundled/BluetoothAdapterSnippet.java35
1 files changed, 22 insertions, 13 deletions
diff --git a/src/main/java/com/google/android/mobly/snippet/bundled/BluetoothAdapterSnippet.java b/src/main/java/com/google/android/mobly/snippet/bundled/BluetoothAdapterSnippet.java
index 90ba707..a6e6dbb 100644
--- a/src/main/java/com/google/android/mobly/snippet/bundled/BluetoothAdapterSnippet.java
+++ b/src/main/java/com/google/android/mobly/snippet/bundled/BluetoothAdapterSnippet.java
@@ -133,35 +133,44 @@ public class BluetoothAdapterSnippet implements Snippet {
*
* <p>The file can be pulled from `/sdcard/btsnoop_hci.log`.
*
- * @return false if enabling the snoop log failed, true otherwise.
* @throws Throwable
*/
@RpcMinSdk(Build.VERSION_CODES.KITKAT)
@Rpc(description = "Enable Bluetooth HCI snoop log for debugging.")
- public boolean btEnableHciSnoopLog() throws Throwable {
+ public void btEnableHciSnoopLog() throws Throwable {
+ boolean success;
try {
- return (boolean)
- mBluetoothAdapter
- .getClass()
- .getDeclaredMethod("configHciSnoopLog", boolean.class)
- .invoke(mBluetoothAdapter, true);
+ success =
+ (boolean)
+ mBluetoothAdapter
+ .getClass()
+ .getDeclaredMethod("configHciSnoopLog", boolean.class)
+ .invoke(mBluetoothAdapter, true);
} catch (InvocationTargetException e) {
throw e.getCause();
}
+ if (!success) {
+ throw new BluetoothAdapterSnippetException("Failed to enable HCI snoop log.");
+ }
}
@RpcMinSdk(Build.VERSION_CODES.KITKAT)
@Rpc(description = "Disable Bluetooth HCI snoop log.")
- public boolean btDisableHciSnoopLog() throws Throwable {
+ public void btDisableHciSnoopLog() throws Throwable {
+ boolean success;
try {
- return (boolean)
- mBluetoothAdapter
- .getClass()
- .getDeclaredMethod("configHciSnoopLog", boolean.class)
- .invoke(mBluetoothAdapter, false);
+ success =
+ (boolean)
+ mBluetoothAdapter
+ .getClass()
+ .getDeclaredMethod("configHciSnoopLog", boolean.class)
+ .invoke(mBluetoothAdapter, false);
} catch (InvocationTargetException e) {
throw e.getCause();
}
+ if (!success) {
+ throw new BluetoothAdapterSnippetException("Failed to disable HCI snoop log.");
+ }
}
@Override