Merge "PBAP C: Run the abort operation in a seperate thread"
diff --git a/bttestapp/src/org/codeaurora/bluetooth/bttestapp/PbapTestActivity.java b/bttestapp/src/org/codeaurora/bluetooth/bttestapp/PbapTestActivity.java
index d9a8b2e..fd7e70c 100644
--- a/bttestapp/src/org/codeaurora/bluetooth/bttestapp/PbapTestActivity.java
+++ b/bttestapp/src/org/codeaurora/bluetooth/bttestapp/PbapTestActivity.java
@@ -280,8 +280,8 @@
         @Override
         public void onPullPhoneBookError() {
             Logger.e(TAG, "Received from PBAP pull phone book error.");
-            mListViewDownloadContacts.setVisibility(View.GONE);
             stopProgressBarDownload();
+            mListViewDownloadContacts.setVisibility(View.GONE);
             Toast.makeText(PbapTestActivity.this, "PullPhoneBook FAILED", Toast.LENGTH_LONG).show();
             new MonkeyEvent("pbap-pullphonebook", false).send();
         }
@@ -289,8 +289,8 @@
         @Override
         public void onPullVcardListingError() {
             Logger.e(TAG, "Received from PBAP listing error.");
-            mListViewBrowseContacts.setVisibility(View.GONE);
             stopProgressBarBrowse();
+            mListViewBrowseContacts.setVisibility(View.GONE);
             Toast.makeText(PbapTestActivity.this, "PullvCardListing FAILED", Toast.LENGTH_LONG)
                     .show();
             new MonkeyEvent("pbap-pullvcardlisting", false).send();