| Index: chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java
|
| index b6a653d633b412da13326e5482981ba776773abc..b7ac8800c60f73b2e145e0f881b38e025750654d 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java
|
| @@ -739,6 +739,8 @@ public class PaymentRequestImpl implements PaymentRequest, PaymentRequestUI.Clie
|
| mAddressEditor.edit(toEdit, new Callback<AutofillAddress>() {
|
| @Override
|
| public void onResult(AutofillAddress completeAddress) {
|
| + if (mUI == null) return;
|
| +
|
| if (completeAddress == null) {
|
| mShippingAddressesSection.setSelectedItemIndex(SectionInformation.NO_SELECTION);
|
| } else if (toEdit == null) {
|
| @@ -764,6 +766,8 @@ public class PaymentRequestImpl implements PaymentRequest, PaymentRequestUI.Clie
|
| mContactEditor.edit(toEdit, new Callback<AutofillContact>() {
|
| @Override
|
| public void onResult(AutofillContact completeContact) {
|
| + if (mUI == null) return;
|
| +
|
| if (completeContact == null) {
|
| mContactSection.setSelectedItemIndex(SectionInformation.NO_SELECTION);
|
| } else if (toEdit == null) {
|
| @@ -779,6 +783,8 @@ public class PaymentRequestImpl implements PaymentRequest, PaymentRequestUI.Clie
|
| mCardEditor.edit(toEdit, new Callback<AutofillPaymentInstrument>() {
|
| @Override
|
| public void onResult(AutofillPaymentInstrument completeCard) {
|
| + if (mUI == null) return;
|
| +
|
| if (completeCard == null) {
|
| mPaymentMethodsSection.setSelectedItemIndex(SectionInformation.NO_SELECTION);
|
| } else if (toEdit == null) {
|
|
|