summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/nfc
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2013-08-14 08:57:11 -0700
committerMartijn Coenen <maco@google.com>2013-08-14 08:57:11 -0700
commite0a38911a3c2d884faaec4da32d19827d3347479 (patch)
treeefb76d11ec1615e17cf0667c270f14078cd0622e /src/com/android/settings/nfc
parent6ee5b4508083fd0dd340396d66927c0fc8870a9b (diff)
downloadpackages_apps_Settings-e0a38911a3c2d884faaec4da32d19827d3347479.zip
packages_apps_Settings-e0a38911a3c2d884faaec4da32d19827d3347479.tar.gz
packages_apps_Settings-e0a38911a3c2d884faaec4da32d19827d3347479.tar.bz2
NFC: Allow to get result from tap-pay default dialog.
Change-Id: Ic9e88dca5577a4f553dca56e0ff387c1e96f2ed2
Diffstat (limited to 'src/com/android/settings/nfc')
-rw-r--r--src/com/android/settings/nfc/PaymentDefaultDialog.java2
1 files changed, 2 insertions, 0 deletions
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 @@ public final class PaymentDefaultDialog extends AlertActivity implements
CardEmulationManager.EXTRA_SERVICE_COMPONENT);
String category = intent.getStringExtra(CardEmulationManager.EXTRA_CATEGORY);
+ setResult(RESULT_CANCELED);
if (!buildDialog(component, category)) {
finish();
}
@@ -62,6 +63,7 @@ public final class PaymentDefaultDialog extends AlertActivity implements
case BUTTON_POSITIVE:
mBackend.setDefaultPaymentApp(mNewDefault);
mBackend.setAutoPaymentMode(true);
+ setResult(RESULT_OK);
break;
case BUTTON_NEGATIVE:
break;