commit 9995bcbc820a2ef923dd77b0dfa100b754c9efe6
author Martijn Coenen <maco@google.com> Wed Aug 14 09:00:01 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 14 09:00:01 2013 -0700
tree 8670495d220dc4956b4694387a74c247ef8eea61
parent 0574c26c36b1b760d80107fb4171cdcb642aabf1
parent fcfd865d5c1f2e20952d64196922840a63e83411

am fcfd865d: Merge "NFC: Allow to get result from tap-pay default dialog." into klp-dev

* commit 'fcfd865d5c1f2e20952d64196922840a63e83411':
  NFC: Allow to get result from tap-pay default dialog.

src/com/android/settings/nfc/PaymentDefaultDialog.java

diff --git a/src/com/android/settings/nfc/PaymentDefaultDialog.java b/src/com/android/settings/nfc/PaymentDefaultDialog.java
index f3217dd..2dd465a 100644
--- a/src/com/android/settings/nfc/PaymentDefaultDialog.java
+++ b/src/com/android/settings/nfc/PaymentDefaultDialog.java
@@ -50,6 +50,7 @@
                 CardEmulationManager.EXTRA_SERVICE_COMPONENT);
         String category = intent.getStringExtra(CardEmulationManager.EXTRA_CATEGORY);
 
+        setResult(RESULT_CANCELED);
         if (!buildDialog(component, category)) {
             finish();
         }
@@ -62,6 +63,7 @@
             case BUTTON_POSITIVE:
                 mBackend.setDefaultPaymentApp(mNewDefault);
                 mBackend.setAutoPaymentMode(true);
+                setResult(RESULT_OK);
                 break;
             case BUTTON_NEGATIVE:
                 break;