PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Martijn Coenen
2013-08-14 15:58:06 +00:00
committed by Android (Google) Code Review
parent cabe7e8218 e0a38911a3
commit fcfd865d5c
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/nfc/PaymentDefaultDialog.java
View File

@@ -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;