From e47ebbeec672ece19e260ccd7f4b83a297bce61e Mon Sep 17 00:00:00 2001
From: Guang Zhu <guangzhu@google.com>
Date: Mon, 28 Apr 2014 20:12:35 -0700
Subject: [PATCH] make success explicit in BT instrumentation util

Change-Id: I6c8eb8cdb7928fa6a7c1bc96b374667d1d6ae6a1
---
 .../bluetooth/BluetoothInstrumentation.java       | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/core/tests/bluetoothtests/src/android/bluetooth/BluetoothInstrumentation.java b/core/tests/bluetoothtests/src/android/bluetooth/BluetoothInstrumentation.java
index 34393f98ae465..0cd19f26e0a5c 100644
--- a/core/tests/bluetoothtests/src/android/bluetooth/BluetoothInstrumentation.java
+++ b/core/tests/bluetoothtests/src/android/bluetooth/BluetoothInstrumentation.java
@@ -25,6 +25,7 @@ public class BluetoothInstrumentation extends Instrumentation {
     private BluetoothTestUtils mUtils = null;
     private BluetoothAdapter mAdapter = null;
     private Bundle mArgs = null;
+    private Bundle mSuccessResult = null;
 
     private BluetoothTestUtils getBluetoothTestUtils() {
         if (mUtils == null) {
@@ -46,6 +47,9 @@ public class BluetoothInstrumentation extends Instrumentation {
     public void onCreate(Bundle arguments) {
         super.onCreate(arguments);
         mArgs = arguments;
+        // create the default result response, but only use it in success code path
+        mSuccessResult = new Bundle();
+        mSuccessResult.putString("result", "SUCCESS");
         start();
     }
 
@@ -67,24 +71,23 @@ public class BluetoothInstrumentation extends Instrumentation {
 
     public void enable() {
         getBluetoothTestUtils().enable(getBluetoothAdapter());
-        finish(null);
+        finish(mSuccessResult);
     }
 
     public void disable() {
         getBluetoothTestUtils().disable(getBluetoothAdapter());
-        finish(null);
+        finish(mSuccessResult);
     }
 
     public void unpairAll() {
         getBluetoothTestUtils().unpairAll(getBluetoothAdapter());
-        finish(null);
+        finish(mSuccessResult);
     }
 
     public void getName() {
         String name = getBluetoothAdapter().getName();
-        Bundle bundle = new Bundle();
-        bundle.putString("name", name);
-        finish(bundle);
+        mSuccessResult.putString("name", name);
+        finish(mSuccessResult);
     }
 
     public void finish(Bundle result) {