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

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

Browse Source 
* commit '9995bcbc820a2ef923dd77b0dfa100b754c9efe6':
  NFC: Allow to get result from tap-pay default dialog.
This commit is contained in:
Martijn Coenen
2013-08-14 09:02:30 -07:00
committed by Android Git Automerger
parent 4a41f33c5a 9995bcbc82
commit 49583c9362
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;