commit 49583c9362b966c28a9b99968063a795dfd37eb0
author Martijn Coenen <maco@google.com> Wed Aug 14 09:02:30 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 14 09:02:30 2013 -0700
tree 4748b455e289b1d7df0874eae5cdeae86c1b1ce1
parent 4a41f33c5a1be8ab8c64c269d3d5cd298f33c681
parent 9995bcbc820a2ef923dd77b0dfa100b754c9efe6

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

* commit '9995bcbc820a2ef923dd77b0dfa100b754c9efe6':
  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;