Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcfd865d authored by Martijn Coenen's avatar Martijn Coenen Committed by Android (Google) Code Review
Browse files

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

parents cabe7e82 e0a38911

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

+2 −0
Original line number Diff line number Diff line
@@ -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;