| Index: chrome/android/java/src/org/chromium/chrome/browser/payments/AddressEditor.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/AddressEditor.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/AddressEditor.java
|
| index 3d8949980c8bbf25dab5e5ee536ee4dd8c111ebe..57b69e173e2dbfcc75ed93a2b536c285f5934d4e 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/payments/AddressEditor.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/AddressEditor.java
|
| @@ -123,10 +123,6 @@ public class AddressEditor extends EditorBase<AutofillAddress> {
|
| AutofillProfileBridge.getSupportedCountries());
|
| }
|
|
|
| - // Country dropdown is cached, so the selected item needs to be updated for every new
|
| - // profile that's being edited.
|
| - mCountryField.setValue(AutofillAddress.getCountryCode(profile));
|
| -
|
| // Changing the country will update which fields are in the model. The actual fields are not
|
| // discarded, so their contents are preserved.
|
| mCountryField.setDropdownCallback(new Callback<Pair<String, Runnable>>() {
|
| @@ -143,6 +139,10 @@ public class AddressEditor extends EditorBase<AutofillAddress> {
|
| mHandler.post(eventData.second);
|
| }
|
| });
|
| +
|
| + // Country dropdown is cached, so the selected item needs to be updated for the new profile
|
| + // that's being edited. This will not fire the dropdown callback.
|
| + mCountryField.setValue(AutofillAddress.getCountryCode(profile));
|
| editor.addField(mCountryField);
|
|
|
| // There's a finite number of fields for address editing. Changing the country will re-order
|
|
|