| Index: chrome/android/java/src/org/chromium/chrome/browser/payments/CardEditor.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/CardEditor.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/CardEditor.java
|
| index 15d68ddc48e9c61200e3b053f5a965ff5cae9713..50f19afe0d7ac83f4b03e3e3fc1787d41ad0e7ff 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/payments/CardEditor.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/CardEditor.java
|
| @@ -487,7 +487,10 @@ public class CardEditor extends EditorBase<AutofillPaymentInstrument> {
|
| }
|
| });
|
|
|
| - mBillingAddressField.setValue(card.getBillingAddressId());
|
| + if (mBillingAddressField.getDropdownKeys().contains(card.getBillingAddressId())) {
|
| + mBillingAddressField.setValue(card.getBillingAddressId());
|
| + }
|
| +
|
| editor.addField(mBillingAddressField);
|
| }
|
|
|
|
|